ChangeLogTag: Wed Jun 25 13:52:13 2003 Gan Deng <gan.deng@vanderbilt.edu>

8 files changed, 419 insertions, 148 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b2db1630971..20bca720290 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Wed Jun 25 13:52:13 2003  Gan Deng  <gan.deng@vanderbilt.edu>
+
+        * performance-tests/Sequence_Latency/DSI/Makefile
+
+          Fixed the dependency relation error.
+
+        * performance-tests/Sequence_Latency/Deferred/client.cpp
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+        * performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+        * performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+        * performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+        * performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+
+	  Fixed the bugs in the code.
+	  Those buys caused errors when dealing with non-native C++ exception handling
+          mechanism.
+
 Wed June 25 14:46:19 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 
         * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp:
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile b/TAO/performance-tests/Sequence_Latency/DSI/Makefile
index 3f813b40d18..459bf1a4fc8 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile
@@ -67,6 +67,21 @@ realclean: clean
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/os_include/os_limits.h \
+  $(ACE_ROOT)/ace/os_include/os_unistd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+  $(ACE_ROOT)/ace/os_include/os_stddef.h \
+  $(ACE_ROOT)/ace/os_include/os_inttypes.h \
+  $(ACE_ROOT)/ace/os_include/os_stdint.h \
+  $(ACE_ROOT)/ace/os_include/os_float.h \
+  $(ACE_ROOT)/ace/os_include/os_stdlib.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_wait.h \
+  $(ACE_ROOT)/ace/os_include/os_signal.h \
+  $(ACE_ROOT)/ace/os_include/os_ucontext.h \
+  $(ACE_ROOT)/ace/os_include/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_select.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -77,6 +92,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/os_include/os_errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
@@ -86,15 +102,46 @@ realclean: clean
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/os_include/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_include/os_string.h \
+  $(ACE_ROOT)/ace/os_include/os_strings.h \
+  $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/os_include/os_dlfcn.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
+  $(ACE_ROOT)/ace/os_include/os_netdb.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_in.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_socket.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_uio.h \
+  $(ACE_ROOT)/ace/os_include/net/os_if.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/os_include/os_stdarg.h \
+  $(ACE_ROOT)/ace/os_include/os_assert.h \
+  $(ACE_ROOT)/ace/os_include/os_stdio.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_tcp.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_shm.h \
+  $(ACE_ROOT)/ace/os_include/os_pwd.h \
+  $(ACE_ROOT)/ace/os_include/os_stropts.h \
+  $(ACE_ROOT)/ace/os_include/os_termios.h \
+  $(ACE_ROOT)/ace/os_include/os_aio.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_un.h \
+  $(ACE_ROOT)/ace/os_include/os_poll.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_msg.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \
+  $(ACE_ROOT)/ace/os_include/os_syslog.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -303,8 +350,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  TestC.i \
-  $(ACE_ROOT)/ace/Get_Opt.h \
+  TestC.i $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Containers_T.h \
@@ -368,6 +414,10 @@ realclean: clean
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -403,6 +453,21 @@ realclean: clean
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/os_include/os_limits.h \
+  $(ACE_ROOT)/ace/os_include/os_unistd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+  $(ACE_ROOT)/ace/os_include/os_stddef.h \
+  $(ACE_ROOT)/ace/os_include/os_inttypes.h \
+  $(ACE_ROOT)/ace/os_include/os_stdint.h \
+  $(ACE_ROOT)/ace/os_include/os_float.h \
+  $(ACE_ROOT)/ace/os_include/os_stdlib.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_wait.h \
+  $(ACE_ROOT)/ace/os_include/os_signal.h \
+  $(ACE_ROOT)/ace/os_include/os_ucontext.h \
+  $(ACE_ROOT)/ace/os_include/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_select.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -413,6 +478,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/os_include/os_errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
@@ -424,15 +490,46 @@ realclean: clean
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/os_include/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_include/os_string.h \
+  $(ACE_ROOT)/ace/os_include/os_strings.h \
+  $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/os_include/os_dlfcn.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
+  $(ACE_ROOT)/ace/os_include/os_netdb.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_in.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_socket.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_uio.h \
+  $(ACE_ROOT)/ace/os_include/net/os_if.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/os_include/os_stdarg.h \
+  $(ACE_ROOT)/ace/os_include/os_assert.h \
+  $(ACE_ROOT)/ace/os_include/os_stdio.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_tcp.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_shm.h \
+  $(ACE_ROOT)/ace/os_include/os_pwd.h \
+  $(ACE_ROOT)/ace/os_include/os_stropts.h \
+  $(ACE_ROOT)/ace/os_include/os_termios.h \
+  $(ACE_ROOT)/ace/os_include/os_aio.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_un.h \
+  $(ACE_ROOT)/ace/os_include/os_poll.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_msg.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \
+  $(ACE_ROOT)/ace/os_include/os_syslog.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
@@ -703,6 +800,10 @@ realclean: clean
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -723,21 +824,30 @@ realclean: clean
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/Strategies/advanced_resource.i
 
-.obj/Roundtrip.o .obj/Roundtrip.so .shobj/Roundtrip.o .shobj/Roundtrip.so: Roundtrip.cpp Roundtrip.h \
+.obj/Roundtrip.o .obj/Roundtrip.so .shobj/Roundtrip.o .shobj/Roundtrip.so: Roundtrip.cpp TestC.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/DynamicInterface/Dynamic_Implementation.h \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/os_include/os_limits.h \
+  $(ACE_ROOT)/ace/os_include/os_unistd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+  $(ACE_ROOT)/ace/os_include/os_stddef.h \
+  $(ACE_ROOT)/ace/os_include/os_inttypes.h \
+  $(ACE_ROOT)/ace/os_include/os_stdint.h \
+  $(ACE_ROOT)/ace/os_include/os_float.h \
+  $(ACE_ROOT)/ace/os_include/os_stdlib.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_wait.h \
+  $(ACE_ROOT)/ace/os_include/os_signal.h \
+  $(ACE_ROOT)/ace/os_include/os_ucontext.h \
+  $(ACE_ROOT)/ace/os_include/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_select.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -748,44 +858,58 @@ realclean: clean
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/os_include/os_errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/os_include/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_include/os_string.h \
+  $(ACE_ROOT)/ace/os_include/os_strings.h \
+  $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/os_include/os_dlfcn.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
+  $(ACE_ROOT)/ace/os_include/os_netdb.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_in.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_socket.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_uio.h \
+  $(ACE_ROOT)/ace/os_include/net/os_if.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/os_include/os_stdarg.h \
+  $(ACE_ROOT)/ace/os_include/os_assert.h \
+  $(ACE_ROOT)/ace/os_include/os_stdio.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_tcp.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_shm.h \
+  $(ACE_ROOT)/ace/os_include/os_pwd.h \
+  $(ACE_ROOT)/ace/os_include/os_stropts.h \
+  $(ACE_ROOT)/ace/os_include/os_termios.h \
+  $(ACE_ROOT)/ace/os_include/os_aio.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_un.h \
+  $(ACE_ROOT)/ace/os_include/os_poll.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_msg.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \
+  $(ACE_ROOT)/ace/os_include/os_syslog.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(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/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -801,6 +925,10 @@ realclean: clean
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -820,6 +948,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -871,17 +1000,35 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/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/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -904,37 +1051,15 @@ realclean: clean
   $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_Impl_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Any_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
-  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.h \
-  $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
-  $(ACE_ROOT)/ace/Atomic_Op.i \
-  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
-  $(TAO_ROOT)/tao/DynamicInterface/dynamicinterface_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
@@ -944,6 +1069,9 @@ realclean: clean
   $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
   $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
   $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -958,6 +1086,12 @@ realclean: clean
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
@@ -982,6 +1116,21 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  TestC.i Roundtrip.h \
+  $(TAO_ROOT)/tao/DynamicInterface/Dynamic_Implementation.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/DynamicInterface/dynamicinterface_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/DynamicInterface/Server_Request.h \
   $(TAO_ROOT)/tao/DynamicInterface/Dynamic_Adapter_Impl.h \
   $(TAO_ROOT)/tao/Dynamic_Adapter.h \
@@ -1016,6 +1165,21 @@ realclean: clean
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/os_include/os_limits.h \
+  $(ACE_ROOT)/ace/os_include/os_unistd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+  $(ACE_ROOT)/ace/os_include/os_stddef.h \
+  $(ACE_ROOT)/ace/os_include/os_inttypes.h \
+  $(ACE_ROOT)/ace/os_include/os_stdint.h \
+  $(ACE_ROOT)/ace/os_include/os_float.h \
+  $(ACE_ROOT)/ace/os_include/os_stdlib.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_wait.h \
+  $(ACE_ROOT)/ace/os_include/os_signal.h \
+  $(ACE_ROOT)/ace/os_include/os_ucontext.h \
+  $(ACE_ROOT)/ace/os_include/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_select.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -1026,6 +1190,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/os_include/os_errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
@@ -1035,15 +1200,46 @@ realclean: clean
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/os_include/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_include/os_string.h \
+  $(ACE_ROOT)/ace/os_include/os_strings.h \
+  $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/os_include/os_dlfcn.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
+  $(ACE_ROOT)/ace/os_include/os_netdb.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_in.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_socket.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_uio.h \
+  $(ACE_ROOT)/ace/os_include/net/os_if.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/os_include/os_stdarg.h \
+  $(ACE_ROOT)/ace/os_include/os_assert.h \
+  $(ACE_ROOT)/ace/os_include/os_stdio.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_tcp.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_shm.h \
+  $(ACE_ROOT)/ace/os_include/os_pwd.h \
+  $(ACE_ROOT)/ace/os_include/os_stropts.h \
+  $(ACE_ROOT)/ace/os_include/os_termios.h \
+  $(ACE_ROOT)/ace/os_include/os_aio.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_un.h \
+  $(ACE_ROOT)/ace/os_include/os_poll.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_msg.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \
+  $(ACE_ROOT)/ace/os_include/os_syslog.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -1252,8 +1448,7 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  TestC.i \
-  $(TAO_ROOT)/tao/Stub.h \
+  TestC.i $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -1299,6 +1494,10 @@ realclean: clean
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/PICurrent.h \
@@ -1377,6 +1576,21 @@ realclean: clean
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/os_include/os_limits.h \
+  $(ACE_ROOT)/ace/os_include/os_unistd.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+  $(ACE_ROOT)/ace/os_include/os_stddef.h \
+  $(ACE_ROOT)/ace/os_include/os_inttypes.h \
+  $(ACE_ROOT)/ace/os_include/os_stdint.h \
+  $(ACE_ROOT)/ace/os_include/os_float.h \
+  $(ACE_ROOT)/ace/os_include/os_stdlib.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_wait.h \
+  $(ACE_ROOT)/ace/os_include/os_signal.h \
+  $(ACE_ROOT)/ace/os_include/os_ucontext.h \
+  $(ACE_ROOT)/ace/os_include/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_resource.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_time.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_select.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -1387,6 +1601,7 @@ realclean: clean
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/os_include/os_errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
@@ -1396,15 +1611,46 @@ realclean: clean
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/os_include/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_include/os_string.h \
+  $(ACE_ROOT)/ace/os_include/os_strings.h \
+  $(ACE_ROOT)/ace/os_include/os_ctype.h \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/os_include/os_dlfcn.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
+  $(ACE_ROOT)/ace/os_include/os_netdb.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_in.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_socket.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_uio.h \
+  $(ACE_ROOT)/ace/os_include/net/os_if.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_sem.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_ipc.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/os_include/os_pthread.h \
+  $(ACE_ROOT)/ace/os_include/os_stdarg.h \
+  $(ACE_ROOT)/ace/os_include/os_assert.h \
+  $(ACE_ROOT)/ace/os_include/os_stdio.h \
+  $(ACE_ROOT)/ace/os_include/os_fcntl.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_stat.h \
   $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/os_include/arpa/os_inet.h \
+  $(ACE_ROOT)/ace/os_include/netinet/os_tcp.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_shm.h \
+  $(ACE_ROOT)/ace/os_include/os_pwd.h \
+  $(ACE_ROOT)/ace/os_include/os_stropts.h \
+  $(ACE_ROOT)/ace/os_include/os_termios.h \
+  $(ACE_ROOT)/ace/os_include/os_aio.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_un.h \
+  $(ACE_ROOT)/ace/os_include/os_poll.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_msg.h \
+  $(ACE_ROOT)/ace/os_include/sys/os_utsname.h \
+  $(ACE_ROOT)/ace/os_include/os_syslog.h \
   $(ACE_ROOT)/ace/Trace.h \
   $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -1711,6 +1957,10 @@ realclean: clean
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/ObjectKey_Table.h \
+  $(ACE_ROOT)/ace/RB_Tree.h \
+  $(ACE_ROOT)/ace/RB_Tree.i \
+  $(ACE_ROOT)/ace/RB_Tree.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1737,6 +1987,8 @@ realclean: clean
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Refcounted_ObjectKey.h \
+  $(TAO_ROOT)/tao/Refcounted_ObjectKey.inl \
   $(TAO_ROOT)/tao/Profile.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 7b54f2e0ea9..ab45f70d402 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -44,8 +44,8 @@ parse_args (int argc, char *argv[])
             ACE_OS::strcmp (data_type, "longlong") != 0)
           return -1;
         break;
-	  
-	  case 's':
+
+          case 's':
         sz = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
@@ -74,8 +74,8 @@ parse_args (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-t <datatype> "
-						   "-s <size> "
-						   "-k <ior> "
+                                                   "-s <size> "
+                                                   "-k <ior> "
                            "-i <niterations> "
                            "-b <burst> "
                            "-x (disable shutdown) "
@@ -114,20 +114,20 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_octet_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("octet_load") <<= ol;
           request[j]->add_in_arg ("send_time") <<= start;
-		  request[j]->set_return_type (CORBA::_tc_ulonglong);
+                  request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -159,7 +159,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -187,20 +187,20 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_long_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("long_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -232,7 +232,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -260,20 +260,20 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_short_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("short_load") <<= sl;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -305,7 +305,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -333,20 +333,20 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_char_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("char_load") <<= cl;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -378,7 +378,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -406,20 +406,20 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_longlong_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("longlong_load") <<= ll;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -451,7 +451,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -479,20 +479,20 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
           request[j] =
             roundtrip->_request ("test_double_method"
                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           request[j]->add_in_arg ("double_load") <<= dl;
           request[j]->add_in_arg ("send_time") <<= start;
-					request[j]->set_return_type (CORBA::_tc_ulonglong);
+                                        request[j]->set_return_type (CORBA::_tc_ulonglong);
 
           request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
 
       for (j = 0; j != burst; ++j)
         {
           request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
 
           CORBA::ULongLong retval;
           if ((request[j]->return_value () >>= retval) == 1)
@@ -524,7 +524,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
   ACE_Throughput_Stats::dump_throughput ("Total", gsf,
                                          test_end - test_start,
                                          stats.samples_count ());
-  return 0;	
+  return 0;
 }
 
 
@@ -579,7 +579,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-	  Test::octet_load oc;	
+          Test::octet_load oc;
 
       for (int j = 0; j < 100; ++j)
         {
@@ -591,9 +591,9 @@ main (int argc, char *argv[])
         }
 
 
-	  // Test various sequence types
+          // Test various sequence types
 
-	  if (ACE_OS::strcmp (data_type, "octet") == 0 )
+          if (ACE_OS::strcmp (data_type, "octet") == 0 )
         {
           test_octet_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index a69dc895526..ae5c11499fe 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
 
 Client_Task::Client_Task (const char *data_type,
                           const int size,
-						  Test::Roundtrip_ptr roundtrip,
+                                                  Test::Roundtrip_ptr roundtrip,
                           int niterations)
   : data_type_ (CORBA::string_dup (data_type))
   , size_ (size)
@@ -27,32 +27,32 @@ Client_Task::svc (void)
 
       if (ACE_OS::strcmp (this->data_type_, "octet") == 0 )
         {
-          this->test_octet_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "long") == 0 )
         {
-          this->test_long_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "short") == 0 )
         {
-          this->test_short_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "char") == 0 )
         {
-          this->test_char_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "longlong") == 0 )
         {
-          this->test_longlong_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "double") == 0 )
         {
-          this->test_double_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -91,7 +91,7 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_octet_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -99,10 +99,10 @@ Client_Task::test_octet_seq (ACE_ENV_ARG_DECL)
   for (int i = 0; i != this->niterations_; ++i)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
- 
+
       (void) this->roundtrip_->test_octet_method (ol, start ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
 
@@ -110,7 +110,7 @@ Client_Task::test_octet_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_long_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -118,10 +118,10 @@ Client_Task::test_long_seq (ACE_ENV_ARG_DECL)
   for (int i = 0; i != this->niterations_; ++i)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
- 
+
       (void) this->roundtrip_->test_long_method (ll, start ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
 
@@ -130,7 +130,7 @@ Client_Task::test_long_seq (ACE_ENV_ARG_DECL)
 
 
 void
-Client_Task::test_short_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -138,10 +138,10 @@ Client_Task::test_short_seq (ACE_ENV_ARG_DECL)
   for (int i = 0; i != this->niterations_; ++i)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
- 
+
       (void) this->roundtrip_->test_short_method (sl, start ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
 
@@ -149,7 +149,7 @@ Client_Task::test_short_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_char_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -157,10 +157,10 @@ Client_Task::test_char_seq (ACE_ENV_ARG_DECL)
   for (int i = 0; i != this->niterations_; ++i)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
- 
+
       (void) this->roundtrip_->test_char_method (cl, start ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
 
@@ -168,7 +168,7 @@ Client_Task::test_char_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_longlong_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -176,10 +176,10 @@ Client_Task::test_longlong_seq (ACE_ENV_ARG_DECL)
   for (int i = 0; i != this->niterations_; ++i)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
- 
+
       (void) this->roundtrip_->test_longlong_method (ll, start ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
 
@@ -187,7 +187,7 @@ Client_Task::test_longlong_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_double_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
@@ -195,10 +195,10 @@ Client_Task::test_double_seq (ACE_ENV_ARG_DECL)
   for (int i = 0; i != this->niterations_; ++i)
     {
       CORBA::ULongLong start = ACE_OS::gethrtime ();
- 
+
       (void) this->roundtrip_->test_double_method (dl, start ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-  
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       this->latency_.sample (now - start);
 
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
index dbc54ba4a0f..99b44a6c3e4 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h
@@ -16,7 +16,7 @@ class Client_Task : public ACE_Task_Base
 public:
   /// Constructor
   Client_Task (const char *data_type,
-			   int size,
+                           int size,
                Test::Roundtrip_ptr roundtrip,
                int niterations);
 
@@ -34,12 +34,12 @@ private:
   void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Some performance test methods
-  void test_octet_seq (ACE_ENV_ARG_DECL);
-  void test_long_seq (ACE_ENV_ARG_DECL);
-  void test_short_seq (ACE_ENV_ARG_DECL);
-  void test_char_seq (ACE_ENV_ARG_DECL);
-  void test_longlong_seq (ACE_ENV_ARG_DECL);
-  void test_double_seq (ACE_ENV_ARG_DECL);
+  void test_octet_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_long_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_short_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_char_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_double_seq (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index d1989c02d66..997f27f9336 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -27,32 +27,32 @@ Client_Task::svc (void)
 
       if (ACE_OS::strcmp (this->data_type_, "octet") == 0 )
         {
-          this->test_octet_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_octet_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "long") == 0 )
         {
-          this->test_long_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_long_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "short") == 0 )
         {
-          this->test_short_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "char") == 0 )
         {
-          this->test_char_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_char_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "longlong") == 0 )
         {
-          this->test_longlong_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_longlong_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (ACE_OS::strcmp (this->data_type_, "double") == 0 )
         {
-          this->test_double_seq (ACE_ENV_ARG_PARAMETER);
+          this->test_double_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -91,7 +91,7 @@ Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Client_Task::test_octet_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_octet_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::octet_load ol (this->size_);
   ol.length (this->size_);
@@ -110,7 +110,7 @@ Client_Task::test_octet_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_long_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_long_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::long_load ll (this->size_);
   ll.length (this->size_);
@@ -130,7 +130,7 @@ Client_Task::test_long_seq (ACE_ENV_ARG_DECL)
 
 
 void
-Client_Task::test_short_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_short_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::short_load sl (this->size_);
   sl.length (this->size_);
@@ -149,7 +149,7 @@ Client_Task::test_short_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_char_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_char_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::char_load cl (this->size_);
   cl.length (this->size_);
@@ -168,7 +168,7 @@ Client_Task::test_char_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_longlong_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::longlong_load ll (this->size_);
   ll.length (this->size_);
@@ -187,7 +187,7 @@ Client_Task::test_longlong_seq (ACE_ENV_ARG_DECL)
 }
 
 void
-Client_Task::test_double_seq (ACE_ENV_ARG_DECL)
+Client_Task::test_double_seq (ACE_ENV_SINGLE_ARG_DECL)
 {
   Test::double_load dl (this->size_);
   dl.length (this->size_);
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
index b63ac0243f9..99b44a6c3e4 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h
@@ -34,12 +34,12 @@ private:
   void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Some performance test methods
-  void test_octet_seq (ACE_ENV_ARG_DECL);
-  void test_long_seq (ACE_ENV_ARG_DECL);
-  void test_short_seq (ACE_ENV_ARG_DECL);
-  void test_char_seq (ACE_ENV_ARG_DECL);
-  void test_longlong_seq (ACE_ENV_ARG_DECL);
-  void test_double_seq (ACE_ENV_ARG_DECL);
+  void test_octet_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_long_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_short_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_char_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_longlong_seq (ACE_ENV_SINGLE_ARG_DECL);
+  void test_double_seq (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The data type of the sequence load to be tested
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index af72b59a764..2f553cfe46c 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -94,7 +94,9 @@ main (int argc, char *argv[])
                     "client (%P|%t): sched_params failed\n"));
     }
 
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);