diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-12-07 03:14:12 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-12-07 03:14:12 +0000 |
| commit | 58bf95e51dc54806912e18e9a0c813390eea1333 (patch) | |
| tree | 646a4478776f039b7e4317f70d52e521ae9a3d6d | |
| parent | 3640e32fd894c0bfacd4e56afdb7a719924adc59 (diff) | |
| download | ATCD-58bf95e51dc54806912e18e9a0c813390eea1333.tar.gz | |
*** empty log message ***
22 files changed, 392 insertions, 438 deletions
diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index 42297f39111..c064f01b389 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -62,8 +62,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynamicAny.o .obj/DynamicAny.so .shobj/DynamicAny.o .shobj/DynamicAny.so: DynamicAny.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ @@ -71,6 +70,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -80,7 +82,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -182,8 +183,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -222,6 +222,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -332,16 +334,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -351,7 +356,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -379,12 +383,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ @@ -397,6 +397,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -406,7 +409,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -508,8 +510,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -548,6 +549,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -658,16 +661,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -677,7 +683,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -705,12 +710,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAny_i.h DynStruct_i.h DynSequence_i.h DynEnum_i.h \ DynArray_i.h DynUnion_i.h DynUnion_i_T.h DynUnion_i_T.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -727,6 +728,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -736,7 +740,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -838,8 +841,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -878,6 +880,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -988,16 +992,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1007,7 +1014,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -1035,12 +1041,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ @@ -1053,6 +1055,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1062,7 +1067,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1164,8 +1168,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1204,6 +1207,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -1314,16 +1319,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1333,7 +1341,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -1361,12 +1368,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -1382,8 +1385,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(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 \ @@ -1492,8 +1497,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1532,6 +1536,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -1642,16 +1648,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1661,7 +1670,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -1689,12 +1697,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -1709,6 +1713,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1718,7 +1725,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1820,8 +1826,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1860,6 +1865,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -1970,16 +1977,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1989,7 +1999,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -2017,12 +2026,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ @@ -2035,6 +2040,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2044,7 +2052,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2146,8 +2153,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -2186,6 +2192,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -2296,16 +2304,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2315,7 +2326,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -2343,12 +2353,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -2363,6 +2369,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2372,7 +2381,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2474,8 +2482,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -2514,6 +2521,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -2624,16 +2633,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2643,7 +2655,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -2671,19 +2682,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ @@ -2691,6 +2697,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2700,7 +2709,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2802,8 +2810,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - DynamicAnyC.h \ - $(TAO_ROOT)/tao/corba.h \ + DynamicAnyC.h $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -2842,6 +2849,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -2952,16 +2961,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -2971,7 +2983,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -2999,12 +3010,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index 5e1f100eb30..c758167d076 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -68,13 +68,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(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_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -208,13 +210,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(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_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -330,7 +334,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/PolicyC.h \ $(TAO_ROOT)/tao/CurrentC.h \ @@ -366,16 +369,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ DII_Reply_Dispatcher.h dynamicinterface_export.h \ - DII_Reply_Dispatcher.inl Request.h Context.h Context.inl \ - ExceptionList.h ExceptionList.inl \ - $(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/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/MessagingC.h \ $(TAO_ROOT)/tao/ValueBase.h \ $(TAO_ROOT)/tao/ValueBase.i \ @@ -384,7 +378,17 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ - Request.inl DII_Invocation.inl \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + Request.h Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(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 Request.inl \ + DII_Invocation.inl \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -475,19 +479,24 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ $(TAO_ROOT)/tao/debug.h @@ -504,8 +513,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(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 \ @@ -520,6 +531,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ dynamicinterface_export.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/TAO_Export.h \ @@ -606,47 +618,46 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ - DII_Reply_Dispatcher.inl Request.h Context.h Context.inl \ - ExceptionList.h ExceptionList.inl \ - $(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/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/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/Any.h \ + $(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/CurrentC.i \ - $(TAO_ROOT)/tao/Encodable.h \ $(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/Environment.h \ - $(TAO_ROOT)/tao/Environment.i \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/NVList.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/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ $(TAO_ROOT)/tao/MessagingC.i \ - Request.inl \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + Request.h Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(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 Request.inl \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -729,13 +740,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(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_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -836,8 +849,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Request.h Context.h Context.inl ExceptionList.h ExceptionList.inl \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Request.h \ + Context.h Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ @@ -889,8 +902,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/MessagingC.i \ Request.inl Server_Request.h \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ @@ -905,13 +916,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ Server_Request.inl \ $(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/Synch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ $(TAO_ROOT)/tao/Priority_Mapping.h \ @@ -951,6 +963,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -959,7 +974,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1080,8 +1094,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ @@ -1098,6 +1110,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ Server_Request.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1201,16 +1215,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/PortableServer/POA.h \ $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ @@ -1255,13 +1272,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(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_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1362,8 +1381,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/svc_export.h \ $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ace_wchar.inl \ - $(ACE_ROOT)/ace/OS_Dirent.h \ + $(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 \ @@ -1449,8 +1470,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ dynamicinterface_export.h Context.inl ExceptionList.h \ - ExceptionList.inl \ - $(TAO_ROOT)/tao/ORB.h \ + ExceptionList.inl $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -1512,7 +1532,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1540,7 +1559,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ $(TAO_ROOT)/tao/Invocation.i \ - DII_Reply_Dispatcher.h DII_Reply_Dispatcher.inl DII_Invocation.inl + DII_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ + DII_Invocation.inl .obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp Server_Request.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1553,13 +1575,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(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_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ $(ACE_ROOT)/ace/OS_String.inl \ @@ -1638,8 +1662,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - Context.h dynamicinterface_export.h Context.inl \ + $(TAO_ROOT)/tao/corbafwd.i Context.h \ + dynamicinterface_export.h Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -1676,8 +1700,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ @@ -1694,6 +1716,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ Server_Request.inl \ $(TAO_ROOT)/tao/NVList.h \ @@ -1703,6 +1727,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Principal.i \ $(TAO_ROOT)/tao/Marshal.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 6887c800a8b..dcf9b955cae 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -54,8 +54,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORTable.o .obj/IORTable.so .shobj/IORTable.o .shobj/IORTable.so: IORTable.cpp IORTable.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ @@ -63,6 +62,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -71,7 +73,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -150,8 +151,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -193,6 +193,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -322,16 +324,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -341,7 +346,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -369,12 +373,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ IORTableC.i Table_Adapter.h .obj/IORTableC.o .obj/IORTableC.so .shobj/IORTableC.o .shobj/IORTableC.so: IORTableC.cpp IORTableC.h \ @@ -387,6 +387,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -395,7 +398,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -515,6 +517,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -644,16 +648,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -663,7 +670,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -691,17 +697,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ iortable_export.h IORTableC.i .obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ $(ACE_ROOT)/ace/config-sunos5.6.h \ $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/post.h \ @@ -709,6 +710,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Adapter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -718,7 +722,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -860,6 +863,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -968,16 +973,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -987,7 +995,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -1015,12 +1022,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ IORTableC.i .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ @@ -1033,6 +1036,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1041,7 +1047,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1120,8 +1125,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1163,6 +1167,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/GIOP_Message_Base.h \ @@ -1292,16 +1298,19 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Base_Connection_Property.h \ + $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ - $(TAO_ROOT)/tao/Base_Connection_Property.inl \ + $(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/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/debug.h \ @@ -1311,7 +1320,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.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 \ @@ -1339,12 +1347,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ifrfwd.h \ $(TAO_ROOT)/tao/BoundsC.h \ $(TAO_ROOT)/tao/BoundsC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ IORTableC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 318dd693e83..bb1270e6282 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -29,14 +29,14 @@ CPP_SRCS += \ UIOP_Transport \ UIOP_Connector \ UIOP_Acceptor \ - UIOP_Connect \ + UIOP_Connection_Handler \ UIOP_Endpoint \ SHMIOP_Factory \ SHMIOP_Profile \ SHMIOP_Transport \ SHMIOP_Connector \ SHMIOP_Acceptor \ - SHMIOP_Connect \ + SHMIOP_Connection_Handler \ SHMIOP_Endpoint \ TAO_Strategies_Internal \ uiop_endpoints \ diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index f55166544e1..066a8652722 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -19,27 +19,27 @@ ACE_RCSID(Strategies, SHMIOP_Acceptor, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_SHMIOP_Server_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_SHMIOP_Server_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_SHMIOP_Server_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_SHMIOP_Server_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_SHMIOP_Server_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR>; +template class ACE_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; +template class ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; +template class ACE_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; +template class ACE_Creation_Strategy<TAO_SHMIOP_Connection_Handler>; +template class ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>; +template class ACE_Scheduling_Strategy<TAO_SHMIOP_Connection_Handler>; +template class TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler>; +template class TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>; +template class TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Acceptor<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR> -#pragma instantiate ACE_Strategy_Acceptor<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR> +#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_Server_Connection_Handler, ACE_MEM_ACCEPTOR> -#pragma instantiate ACE_Creation_Strategy<TAO_SHMIOP_Server_Connection_Handler> -#pragma instantiate ACE_Concurrency_Strategy<TAO_SHMIOP_Server_Connection_Handler> -#pragma instantiate ACE_Scheduling_Strategy<TAO_SHMIOP_Server_Connection_Handler> -#pragma instantiate TAO_Creation_Strategy<TAO_SHMIOP_Server_Connection_Handler> -#pragma instantiate TAO_Concurrency_Strategy<TAO_SHMIOP_Server_Connection_Handler> -#pragma instantiate TAO_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> +#pragma instantiate TAO_Creation_Strategy<TAO_SHMIOP_Connection_Handler> +#pragma instantiate TAO_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler> +#pragma instantiate TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp index a510251e55c..2931350e9a2 100644 --- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp @@ -303,7 +303,7 @@ TAO_SHMIOP_Connection_Handler::handle_input_i (ACE_HANDLE, // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class _Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; +template class ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index ae5fe1b5071..31bef73757d 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -17,6 +17,7 @@ ACE_RCSID(Strategies, SHMIOP_Connector, "$Id$") TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Octet flag) : TAO_Connector (TAO_TAG_SHMEM_PROFILE), + connect_strategy_ (), base_connector_ (), lite_flag_ (flag) { @@ -30,9 +31,9 @@ TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void) int TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core) { - this->orb_core (orb_core); + this->orb_core (orb_core); - /// Our connect creation strategy + // Our connect creation strategy TAO_SHMIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; ACE_NEW_RETURN (connect_creation_strategy, @@ -440,12 +441,13 @@ TAO_SHMIOP_Connector::object_key_delimiter (void) const #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_SHMIOP_Client_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_SHMIOP_Client_Connection_Handler, ACE_MEM_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_SHMIOP_Client_Connection_Handler, ACE_MEM_CONNECTOR>; -template class ACE_Connector<TAO_SHMIOP_Client_Connection_Handler, ACE_MEM_CONNECTOR>; -template class ACE_Svc_Tuple<TAO_SHMIOP_Client_Connection_Handler>; +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_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; @@ -456,13 +458,14 @@ template class ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Client_Connection_Handler*>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Concurrency_Strategy<TAO_SHMIOP_Client_Connection_Handler> -#pragma instantiate ACE_Strategy_Connector<TAO_SHMIOP_Client_Connection_Handler, ACE_MEM_CONNECTOR> -#pragma instantiate ACE_Connect_Strategy<TAO_SHMIOP_Client_Connection_Handler, ACE_MEM_CONNECTOR> +#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_Connector<TAO_SHMIOP_Client_Connection_Handler, ACE_MEM_Connector> -#pragma instantiate ACE_Creation_Strategy<TAO_SHMIOP_Client_Connection_Handler> -#pragma instantiate ACE_Svc_Tuple<TAO_SHMIOP_Client_Connection_Handler> #pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX> #pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Client_Connection_Handler>*> diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h index 7cab3524167..1bb63ac6901 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.h +++ b/TAO/tao/Strategies/SHMIOP_Connector.h @@ -98,15 +98,14 @@ private: ACE_MEM_Addr address_; // local address - /// Our connect strategy TAO_SHMIOP_CONNECT_STRATEGY connect_strategy_; + // Our connect strategy - /// The connector initiating connection requests for IIOP. TAO_SHMIOP_BASE_CONNECTOR base_connector_; + // The connector initiating connection requests for SHMIOP. - /// Are we using GIOP lite?? CORBA::Boolean lite_flag_; - + // Are we using GIOP lite?? }; #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */ diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index 4914b561b03..feb2c10245d 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -24,7 +24,7 @@ #include "strategies_export.h" #include "ace/Svc_Handler.h" -#include "ace/Mem_Stream.h" +#include "ace/MEM_Stream.h" #include "tao/Pluggable.h" class TAO_SHMIOP_Connection_Handler; diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 05476fdd171..1a2d60a103b 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -32,15 +32,15 @@ ACE_RCSID(Strategies, UIOP_Acceptor, "$Id$") #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>; -template class ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>; -template class ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>; -template class ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>; -template class ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>; -template class ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>; -template class TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>; -template class TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>; -template class TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>; +template class ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; +template class ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; +template class ACE_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; +template class ACE_Creation_Strategy<TAO_UIOP_Connection_Handler>; +template class ACE_Concurrency_Strategy<TAO_UIOP_Connection_Handler>; +template class ACE_Scheduling_Strategy<TAO_UIOP_Connection_Handler>; +template class TAO_Creation_Strategy<TAO_UIOP_Connection_Handler>; +template class TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler>; +template class TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h index 82a7b9c2a11..00e27fbf1ca 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.h +++ b/TAO/tao/Strategies/UIOP_Acceptor.h @@ -33,8 +33,10 @@ #include "ace/Acceptor.h" #include "ace/LSOCK_Acceptor.h" -#include "UIOP_Connect.h" +#include "UIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" +#include "tao/GIOP_Message_State.h" + // TAO UIOP_Acceptor concrete call defination @@ -55,10 +57,10 @@ public: virtual ~TAO_UIOP_Acceptor (void); // Destructor - typedef ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR; - typedef TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler> TAO_UIOP_CREATION_STRATEGY; - typedef TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler> TAO_UIOP_CONCURRENCY_STRATEGY; - typedef TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_ACCEPT_STRATEGY; + typedef ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR; + typedef TAO_Creation_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CREATION_STRATEGY; + typedef TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler> TAO_UIOP_CONCURRENCY_STRATEGY; + typedef TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR> TAO_UIOP_ACCEPT_STRATEGY; // = The TAO_Acceptor methods, check the documentation in // Pluggable.h for details. diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp index 5844199f791..e1df3817d2a 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp @@ -1,6 +1,6 @@ // $Id$ -#include "UIOP_Connect.h" +#include "UIOP_Connection_Handler.h" #if TAO_HAS_UIOP == 1 @@ -31,7 +31,7 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (ACE_Thread_Manager *t) TAO_Connection_Handler (0), transport_ (this, 0, 0), refcount_ (1), - tcp_properties_ (0) + uiop_properties_ (0) { // This constructor should *never* get called, it is just here to // make the compiler happy: the default implementation of the @@ -49,7 +49,7 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core TAO_Connection_Handler (orb_core), transport_ (this, orb_core, flag), refcount_ (1), - tcp_properties_ (ACE_static_cast + uiop_properties_ (ACE_static_cast (TAO_UIOP_Properties *, arg)) { } @@ -84,40 +84,22 @@ int TAO_UIOP_Connection_Handler::open (void*) { if (this->set_socket_option (this->peer (), - this->tcp_properties_->send_buffer_size, - this->tcp_properties_->recv_buffer_size) == -1) + this->uiop_properties_->send_buffer_size, + this->uiop_properties_->recv_buffer_size) == -1) return -1; -#if !defined (ACE_LACKS_TCP_NODELAY) + // Called by the <Strategy_Acceptor> when the handler is completely + // connected. + ACE_UNIX_Addr addr; - 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 */ - - // 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) UIOP connection from client") - ACE_TEXT ("<%s> on %d\n"), - client, this->peer ().get_handle ())); - } + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) UIOP connection to server ") + ACE_TEXT ("<%s> on %d\n"), + addr.get_path_name (), this->peer ().get_handle ())); return 0; } @@ -243,7 +225,7 @@ TAO_UIOP_Connection_Handler::close (u_long) int TAO_UIOP_Connection_Handler::add_handler_to_cache (void) { - ACE_INET_Addr addr; + ACE_UNIX_Addr addr; // Get the peername. if (this->peer ().get_remote_addr (addr) == -1) diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h index eb39aacc0ee..ccc2cbf3f72 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.h +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h @@ -145,7 +145,7 @@ private: u_long refcount_; /// TCP configuration for this connection. - TAO_UIOP_Properties *tcp_properties_; + TAO_UIOP_Properties *uiop_properties_; }; diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.inl b/TAO/tao/Strategies/UIOP_Connection_Handler.inl index c79da486e4d..e10b7977148 100644 --- a/TAO/tao/Strategies/UIOP_Connection_Handler.inl +++ b/TAO/tao/Strategies/UIOP_Connection_Handler.inl @@ -5,13 +5,7 @@ ACE_INLINE TAO_Transport * -TAO_UIOP_Server_Connection_Handler::transport (void) -{ - return &(this->transport_); -} - -ACE_INLINE TAO_Transport * -TAO_UIOP_Client_Connection_Handler::transport (void) +TAO_UIOP_Connection_Handler::transport (void) { return &(this->transport_); } diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 10fd592979a..a9acd69d64c 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -15,45 +15,8 @@ ACE_RCSID(Strategies, UIOP_Connector, "$Id$") - -TAO_UIOP_Connect_Creation_Strategy:: - TAO_UIOP_Connect_Creation_Strategy (ACE_Thread_Manager* t, - TAO_ORB_Core* orb_core, - void *arg, - CORBA::Boolean flag) - : ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler> (t), - orb_core_ (orb_core), - arg_ (arg), - lite_flag_ (flag) -{ -} - -TAO_UIOP_Connect_Creation_Strategy:: - ~TAO_UIOP_Connect_Creation_Strategy (void) -{ -} - - -int -TAO_UIOP_Connect_Creation_Strategy::make_svc_handler - (TAO_UIOP_Client_Connection_Handler *&sh) -{ - if (sh == 0) - ACE_NEW_RETURN (sh, - TAO_UIOP_Client_Connection_Handler - (this->orb_core_->thr_mgr (), - this->orb_core_, - this->lite_flag_, - this->arg_), - -1); - return 0; -} - -// ************************************************************* - TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag) : TAO_Connector (TAO_TAG_UIOP_PROFILE), - null_activation_strategy_ (), connect_strategy_ (), base_connector_ (), lite_flag_ (flag) @@ -72,19 +35,28 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core) if (this->init_uiop_properties () != 0) return -1; - TAO_UIOP_Connect_Creation_Strategy *connect_creation_strategy = 0; + // Our connect creation strategy + TAO_UIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0; + ACE_NEW_RETURN (connect_creation_strategy, - TAO_UIOP_Connect_Creation_Strategy - (this->orb_core ()->thr_mgr (), - this->orb_core (), - &(this->uiop_properties_), - this->lite_flag_), + TAO_UIOP_CONNECT_CREATION_STRATEGY + (orb_core->thr_mgr (), + orb_core, + &(this->uiop_properties_), + this->lite_flag_), + -1); + + /// Our activation strategy + TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0; + + ACE_NEW_RETURN (concurrency_strategy, + TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core), -1); return this->base_connector_.open (this->orb_core ()->reactor (), connect_creation_strategy, &this->connect_strategy_, - &this->null_activation_strategy_); + concurrency_strategy); } int @@ -92,10 +64,12 @@ TAO_UIOP_Connector::close (void) { // Zap the creation strategy that we created earlier. delete this->base_connector_.creation_strategy (); + delete this->base_connector_.concurrency_strategy (); return this->base_connector_.close (); } + int TAO_UIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, TAO_Transport *& transport, @@ -130,7 +104,7 @@ TAO_UIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, return -1; int result = 0; - TAO_UIOP_Client_Connection_Handler *svc_handler = 0; + TAO_UIOP_Connection_Handler *svc_handler = 0; TAO_Connection_Handler *conn_handler = 0; // Check the Cache first for connections @@ -144,7 +118,7 @@ TAO_UIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc, // We have found a connection and a handler svc_handler = - ACE_dynamic_cast (TAO_UIOP_Client_Connection_Handler *, + ACE_dynamic_cast (TAO_UIOP_Connection_Handler *, conn_handler); } else @@ -270,7 +244,7 @@ TAO_UIOP_Connector::preconnect (const char *preconnects) // array of eventual handlers. num_connections = dests.size (); ACE_UNIX_Addr *remote_addrs = 0; - TAO_UIOP_Client_Connection_Handler **handlers = 0; + TAO_UIOP_Connection_Handler **handlers = 0; char *failures = 0; ACE_NEW_RETURN (remote_addrs, @@ -280,10 +254,10 @@ TAO_UIOP_Connector::preconnect (const char *preconnects) ACE_Auto_Basic_Array_Ptr<ACE_UNIX_Addr> safe_remote_addrs (remote_addrs); ACE_NEW_RETURN (handlers, - TAO_UIOP_Client_Connection_Handler *[num_connections], + TAO_UIOP_Connection_Handler *[num_connections], -1); - ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Client_Connection_Handler *> + ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler *> safe_handlers (handlers); ACE_NEW_RETURN (failures, @@ -520,13 +494,12 @@ 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 ACE_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>; -template class ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>; -template class ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>; -template class ACE_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>; -template class ACE_Connector<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR>; -template class ACE_Svc_Tuple<TAO_UIOP_Client_Connection_Handler>; +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_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Client_Connection_Handler> *, ACE_SYNCH_RW_MUTEX>; diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h index 88460e1e4bb..ca04a02c403 100644 --- a/TAO/tao/Strategies/UIOP_Connector.h +++ b/TAO/tao/Strategies/UIOP_Connector.h @@ -33,47 +33,11 @@ #include "ace/Connector.h" #include "ace/LSOCK_Connector.h" -#include "UIOP_Connect.h" +#include "UIOP_Connection_Handler.h" #include "tao/Resource_Factory.h" +#include "tao/Connector_Impl.h" -// **************************************************************** -class TAO_Strategies_Export TAO_UIOP_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler> -{ - // = TITLE - // Helper creation strategy - // - // = DESCRIPTION - // Creates UIOP_Client_Connection_Handler objects but satisfies - // the interface required by the - // ACE_Creation_Strategy<TAO_UIOP_Client_Connection_Handler> - // -public: - TAO_UIOP_Connect_Creation_Strategy (ACE_Thread_Manager * = 0, - TAO_ORB_Core* orb_core = 0, - void *arg = 0, - CORBA::Boolean flag = 0); - // Constructor. <arg> parameter is used to pass any special - // state/info to the service handler upon creation. Currently used - // by IIOP and UIOP to pass protocol configuration properties. - - ~TAO_UIOP_Connect_Creation_Strategy (void); - // Destructor - virtual int make_svc_handler (TAO_UIOP_Client_Connection_Handler *&sh); - // Makes TAO_UIOP_Client_Connection_Handlers - -private: - TAO_ORB_Core* orb_core_; - // The ORB - - void *arg_; - // Some info/state to be passed to the service handler we create. - - CORBA::Boolean lite_flag_; - // Are we using lite? -}; - -// **************************************************************** class TAO_Strategies_Export TAO_UIOP_Connector : public TAO_Connector { @@ -120,23 +84,23 @@ protected: public: - typedef ACE_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler> - TAO_ACTIVATION_STRATEGY; + typedef TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler> + TAO_UIOP_CONNECT_CONCURRENCY_STRATEGY; - typedef ACE_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, - ACE_LSOCK_CONNECTOR> - TAO_CONNECT_STRATEGY ; + typedef TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler> + TAO_UIOP_CONNECT_CREATION_STRATEGY; - typedef ACE_Strategy_Connector<TAO_UIOP_Client_Connection_Handler, + typedef ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR> + TAO_UIOP_CONNECT_STRATEGY ; + + typedef ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, + ACE_LSOCK_CONNECTOR> TAO_UIOP_BASE_CONNECTOR; private: - TAO_ACTIVATION_STRATEGY null_activation_strategy_; - // Our activation strategy - - TAO_CONNECT_STRATEGY connect_strategy_; + TAO_UIOP_CONNECT_STRATEGY connect_strategy_; // Our connect strategy TAO_UIOP_BASE_CONNECTOR base_connector_; diff --git a/TAO/tao/Strategies/UIOP_Endpoint.cpp b/TAO/tao/Strategies/UIOP_Endpoint.cpp index 143e736e5ee..32a743fc980 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp @@ -3,7 +3,7 @@ #include "UIOP_Endpoint.h" -#include "UIOP_Connect.h" +#include "UIOP_Connection_Handler.h" #if TAO_HAS_UIOP == 1 @@ -18,7 +18,6 @@ ACE_RCSID(Strategies, UIOP_Endpoint, "$Id$") TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr) : TAO_Endpoint (TAO_TAG_UIOP_PROFILE), object_addr_ (addr), - hint_ (0), next_ (0) { } @@ -26,7 +25,6 @@ TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (const ACE_UNIX_Addr &addr) TAO_UIOP_Endpoint::TAO_UIOP_Endpoint (void) : TAO_Endpoint (TAO_TAG_UIOP_PROFILE), object_addr_ (), - hint_ (0), next_ (0) { } @@ -49,8 +47,8 @@ TAO_UIOP_Endpoint::addr_to_string (char *buffer, size_t length) void TAO_UIOP_Endpoint::reset_hint (void) { - if (this->hint_) - this->hint_->cleanup_hint ((void **) &this->hint_); + // if (this->hint_) + //this->hint_->cleanup_hint ((void **) &this->hint_); } TAO_Endpoint * diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h index 031b6bd9193..8df34f76ec2 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.h +++ b/TAO/tao/Strategies/UIOP_Endpoint.h @@ -84,7 +84,7 @@ public: // Return a pointer to the rendezvous point string. // This object maintains ownership of the returned string. - TAO_UIOP_Client_Connection_Handler *&hint (void); + // TAO_UIOP_Client_Connection_Handler *&hint (void); // Access to our <hint_>. private: @@ -93,7 +93,7 @@ private: // Cached instance of <ACE_UNIX_Addr> for use in making // invocations, etc. - TAO_UIOP_Client_Connection_Handler *hint_; + // TAO_UIOP_Client_Connection_Handler *hint_; // Hint indicating the last successfully used connection handler for // a connection established through this endpoint's acceptor. diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i index 440223aa06b..fa86101d27f 100644 --- a/TAO/tao/Strategies/UIOP_Endpoint.i +++ b/TAO/tao/Strategies/UIOP_Endpoint.i @@ -9,11 +9,12 @@ TAO_UIOP_Endpoint::object_addr (void) const return this->object_addr_; } -ACE_INLINE TAO_UIOP_Client_Connection_Handler *& +/*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 407eb33dab8..898d6c2cd60 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -32,7 +32,7 @@ #include "strategies_export.h" #include "tao/Object_KeyC.h" -#include "UIOP_Connect.h" +#include "UIOP_Connection_Handler.h" #include "UIOP_Endpoint.h" #include "ace/UNIX_Addr.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 885535e01d9..c76e667b4da 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Strategies, UIOP_Transport, "$Id$") -#include "UIOP_Connect.h" +#include "UIOP_Connection_Handler.h" #include "UIOP_Profile.h" #include "tao/Timeprobe.h" #include "tao/CDR.h" diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index de4a2b3726d..e66a680f25c 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -26,13 +26,14 @@ # if TAO_HAS_UIOP == 1 #include "ace/LSOCK_Acceptor.h" -#include "tao/GIOP_Message_State.h" #include "ace/Synch.h" #include "ace/Svc_Handler.h" // Forward decls. class TAO_ORB_Core; +class TAO_UIOP_Connection_Handler; +class TAO_Pluggable_Messaging; typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH> TAO_UIOP_SVC_HANDLER; |