diff options
author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-15 17:24:49 +0000 |
---|---|---|
committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-15 17:24:49 +0000 |
commit | fc71ff4390f3a0569a96aa7919d521acb60186df (patch) | |
tree | a92b069e8ae16bee33365f4325af9176545a91d9 | |
parent | 3088f667f6380a52f64f72b6cd4fa7a9ae21028b (diff) | |
download | ATCD-fc71ff4390f3a0569a96aa7919d521acb60186df.tar.gz |
*** empty log message ***
31 files changed, 4663 insertions, 1907 deletions
diff --git a/TAO/TAO_IDL/Makefile.bor b/TAO/TAO_IDL/Makefile.bor index 6ae95162df3..7ecb57b6f06 100644 --- a/TAO/TAO_IDL/Makefile.bor +++ b/TAO/TAO_IDL/Makefile.bor @@ -1,7 +1,7 @@ -# -# Makefile for building the TAO IDL compiler -# - -MAKEFILES = TAO_IDL_FE.bor TAO_IDL_BE.bor tao_idl.bor - -!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> +#
+# Makefile for building the TAO IDL compiler
+#
+
+MAKEFILES = TAO_IDL_FE.bor TAO_IDL_BE.bor tao_idl.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/Multicast_Quoter/Makefile b/TAO/examples/Multicast_Quoter/Makefile new file mode 100644 index 00000000000..e546515a536 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/Makefile @@ -0,0 +1,914 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +IDL_FILES = test +IDL_SRC = testC.cpp testS.cpp +BIN_UNCHECKED = server client + +SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) + +CLIENT_OBJS = client.o testC.o +SERVER_OBJS = server.o $(IDL_SRC:.cpp=.o) + +BUILD = $(BIN) +TAO_SRVR_LIBS = $(LDLIBS:%=%$(VAR)) +VBIN = $(BIN:%=%$(VAR)) +TAO_IDLFLAGS += -Ge 1 + +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU + +ifeq ($(rt_corba),1) +BIN=$(BIN_UNCHECKED) +endif # rt_corba + +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +TAO_SRVR_LIBS := -lTAO_Strategies $(TAO_SRVR_LIBS) +TAO_CLNT_LIBS := -lTAO_Strategies $(TAO_CLNT_LIBS) + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext)) + +server: $(addprefix $(VDIR),$(SERVER_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) + +client: $(addprefix $(VDIR),$(CLIENT_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp testS.h testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(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_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + testS_T.h testS_T.cpp testS_T.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(TAO_ROOT)/tao/Strategies/advanced_resource.h \ + $(TAO_ROOT)/tao/Strategies/strategies_export.h \ + $(TAO_ROOT)/tao/default_resource.h + +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(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_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Sched_Params.h \ + $(TAO_ROOT)/tao/Strategies/advanced_resource.h \ + $(TAO_ROOT)/tao/Strategies/strategies_export.h \ + $(TAO_ROOT)/tao/default_resource.h + +.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(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_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + testC.i + +.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(ACE_ROOT)/ace/pre.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(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_String.h \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(TAO_ROOT)/tao/try_macros.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/PollableC.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(TAO_ROOT)/tao/Interceptor_List.h \ + $(TAO_ROOT)/tao/RT_Policy_i.h \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Singleton.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/TAOC.h \ + $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ + $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/PortableInterceptor.h \ + $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + testS_T.h testS_T.cpp testS_T.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.cpp \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/RequestInfo_Util.h \ + testS.i + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/Multicast_Quoter/Makefile.bor b/TAO/examples/Multicast_Quoter/Makefile.bor new file mode 100644 index 00000000000..1388c960ecf --- /dev/null +++ b/TAO/examples/Multicast_Quoter/Makefile.bor @@ -0,0 +1,7 @@ +# +# Makefile for building the Client_Propagated test executables +# + +MAKEFILES = server.bor client.bor + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/examples/Multicast_Quoter/Quoter.idl b/TAO/examples/Multicast_Quoter/Quoter.idl new file mode 100644 index 00000000000..5df5daadc2d --- /dev/null +++ b/TAO/examples/Multicast_Quoter/Quoter.idl @@ -0,0 +1,19 @@ +// +// $Id$ +// + +module Quoter +{ + + struct Stock_Quote { + double price; + string symbol; + string full_name; + }; + + interface Quote_Receiver + { + oneway void update_stock_price (in Stock_Quote quote); + }; +}; + diff --git a/TAO/examples/Multicast_Quoter/README b/TAO/examples/Multicast_Quoter/README new file mode 100644 index 00000000000..1279b901967 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/README @@ -0,0 +1,50 @@ +$Id$ + +This is a unit test for RTCORBA::CLIENT_PROPAGATED priority model. + +Scenario: +-------- + +Server creates a POA with RTCORBA::CLIENT_PROPAGATED priority model +policy and registers a servant with it. Client obtains the object +reference and verifies that it does have the RTCORBA::CLIENT_PROPAGATED +priority model set. Client then performs several invocations on the +object, changing the priority of its thread before each. The client +also passes its thread priority as an argument to each operation. +For each invocation, the servant checks that it's thread priority is +equivalent to the priority of the invoking client thread, which we know +from the operation argument. In addition, the server verifies that +it's starting thread priority (before entering ORB event loop) is the +same as it's ending thread priority (ater ORB shutdown), to insure +that the thread servicing the requests at client propagated priority +is always returned to its original priority. + +To run (on Unix): +------- +$./server +$./client + +Options: +-------- +server [-o ior_output_file] +client [-k server_ior] + +Expected output: +---------------- +Client executable produces no output (unless there are errors). +Server should produces the following if there are no errors (the +priority numbers may differ from platform to platform): + +$server +Activated as <IOR:010000000d00000049444c3a546573743a312e300000000001000000000000 +00a6000000010102cd15000000636f727269646f2e63732e777573746c2e65647500cde304230000 +0014010f004e5354c5c9a539bd0105000100000001000000000000000100000001000000cd040000 +00000000000800000001cdcdcd004f4154010000001400000001cdcdcd0100010000000000090101 +0000000000004f41540400000001cd0000020000001a00000001cdcdcd01000000020041540a0000 +0001cdcdcd000000000000> + +Client priority: 0 Servant thread priority: 0 +Client priority: 1 Servant thread priority: 1 +Client priority: 2 Servant thread priority: 2 +Server ORB event loop finished +Final priority of the servant thread = its initial priority diff --git a/TAO/examples/Multicast_Quoter/client.cpp b/TAO/examples/Multicast_Quoter/client.cpp new file mode 100644 index 00000000000..e4830c53a28 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/client.cpp @@ -0,0 +1,64 @@ +// $Id$ + +#include "QuoterC.h" + +const char *ior = "file://quoter_group.ior"; + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + // Initialize and obtain reference to the Test object. + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + CORBA::Object_var object = + orb->string_to_object (ior, ACE_TRY_ENV); + ACE_TRY_CHECK; + + Quoter::Quote_Receiver_var receiver = + Quoter::Quote_Receiver::_narrow (object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (CORBA::is_nil (receiver.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "ERROR: Object reference <%s> is nil\n", + ior), + 1); + } + + Quoter::Stock_Quote quote; + + quote.symbol = CORBA::string_dup ("ACME"); + quote.full_name = CORBA::string_dup ("ACME Labs"); + quote.price = 1.0; + + // Send some stock price updates to the receivers. + for (int i = 0; i < 10; i++) + { + receiver->update_stock_price (quote, ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Update the stock price. + quote.price = quote.price * 1.5; + + // Pause before sampling the stock price at the next + // interval. + ACE_Time_Value tv (0, 500000); + ACE_OS::sleep (tv); + } + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Caught unexpected exception:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} + diff --git a/TAO/examples/Multicast_Quoter/client.dsp b/TAO/examples/Multicast_Quoter/client.dsp new file mode 100644 index 00000000000..fe0fbb3c6b6 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/client.dsp @@ -0,0 +1,204 @@ +# Microsoft Developer Studio Project File - Name="Multicast Quoter Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Multicast Quoter Client - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "client.mak" CFG="Multicast Quoter Client - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Multicast Quoter Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multicast Quoter Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Multicast Quoter Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "Multicast Quoter Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\Strategies" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Multicast Quoter Client - Win32 Release"
+# Name "Multicast Quoter Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QuoterC.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\QuoterC.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\QuoterC.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\Quoter.idl
+
+!IF "$(CFG)" == "Multicast Quoter Client - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build
+InputPath=.\Quoter.idl
+InputName=Quoter
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Multicast Quoter Client - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\Quoter.idl
+InputName=Quoter
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/examples/Multicast_Quoter/run_test.pl b/TAO/examples/Multicast_Quoter/run_test.pl new file mode 100644 index 00000000000..36f3155daef --- /dev/null +++ b/TAO/examples/Multicast_Quoter/run_test.pl @@ -0,0 +1,46 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib '../../../../bin'; +use PerlACE::Run_Test; + +$status = 0; + +$iorfile = PerlACE::LocalFile ("test.ior"); + +unlink $iorfile; + +print STDERR "\n RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n"; + +$SV = new PerlACE::Process ("server", "-o $iorfile"); +$CL = new PerlACE::Process ("client", "-k file://$iorfile"); + +$SV->Spawn (); + +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { + print STDERR "ERROR: cannot find file <$iorfile>\n"; + $SV->Kill (); + exit 1; +} + +$client = $CL->SpawnWaitKill (60); + +if ($client != 0) { + print STDERR "ERROR: client returned $client\n"; + $status = 1; +} + +$server = $SV->WaitKill (60); + +if ($server !=0) { + print STDERR "ERROR: server returned $server\n"; + $status = 1; +} + +unlink $iorfile; + +exit $status; diff --git a/TAO/examples/Multicast_Quoter/server.cpp b/TAO/examples/Multicast_Quoter/server.cpp new file mode 100644 index 00000000000..55a841a8bc1 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/server.cpp @@ -0,0 +1,150 @@ +// $Id$ + +#include "QuoterS.h" +#include "tao/PortableGroup/miopC.h" +#include "tao/PortableGroup/PortableGroupC.h" +#include "ace/Get_Opt.h" + +class Quote_Receiver_i : public POA_Quoter::Quote_Receiver +{ + // = TITLE + // An implementation of the Quote_Receiver interface + // +public: + /// Constructor. + Quote_Receiver_i (CORBA::ORB_ptr orb, + int num_updates); + + // = + virtual void update_stock_price ( + const Quoter::Stock_Quote & quote, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); + +private: + // The ORB. + CORBA::ORB_var orb_; + + // Quit after receiving a specified number of stock updates. + int quote_updates_left_; +}; + +Quote_Receiver_i::Quote_Receiver_i (CORBA::ORB_ptr orb, + int num_updates) + : orb_ (CORBA::ORB::_duplicate (orb)), + quote_updates_left_ (num_updates) +{ +} + +void +Quote_Receiver_i::update_stock_price (const Quoter::Stock_Quote & quote, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) + +{ + printf ("%s is now at $%.2f!\n", + quote.symbol.in (), + quote.price); + + this->quote_updates_left_--; + + // Check if we've received enough quotes. + if (this->quote_updates_left_ <= 0) + { + // Shutdown. + this->orb_->shutdown (0, ACE_TRY_ENV); + } +} + + +int +main (int argc, char *argv[]) +{ + ACE_TRY_NEW_ENV + { + // Standard initialization: + // parse arguments and get all the references (ORB, + // RootPOA, RTORB, RTCurrent, POAManager). + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Create an instance of our servant. + Quote_Receiver_i quote_receiver (orb.in (), 10); + +#if 1 + CORBA::Object_var MIOP = + orb->resolve_initial_references (TAO_OBJID_MIOP, + 0, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + MIOP::MulticastObjectGroupFactory_var mogf = + MIOP::MulticastObjectGroupFactory::_narrow (MIOP.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Create a multicast group IOR + CORBA::Octet class_d_address[4]={225,1,1,1}; + + CORBA::Object_var group1 = mogf->create_group (quote_receiver._interface_repository_id (), + class_d_address, + 1234, + ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Print Object IOR. + CORBA::String_var ior = + orb->object_to_string (group1.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + FILE *output_file= ACE_OS::fopen ("quoter_group.ior", "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + "quoter_group.ior"), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); +#else + CORBA::String_var ior = CORBA::string_dup ("corbaloc:miop:1.0@1.0-Acme_Stock_Quotes_Domain-1/225.1.1.8:5000"); + CORBA::Object_var group1 = orb->string_to_object (ior, ACE_TRY_ENV); + ACE_TRY_CHECK; +#endif + + CORBA::Object_var object = + orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + ACE_TRY_CHECK; + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::ObjectId_var id = + root_poa->create_id_for_reference (group1, ACE_TRY_ENV); + ACE_TRY_CHECK; + + root_poa->activate_object_with_id (id, "e_receiver, ACE_TRY_ENV); + ACE_TRY_CHECK; + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (ACE_TRY_ENV); + ACE_TRY_CHECK; + + // Run ORB Event loop. + poa_manager->activate (ACE_TRY_ENV); + ACE_TRY_CHECK; + + orb->run (ACE_TRY_ENV); + ACE_TRY_CHECK; + } + ACE_CATCHANY + { + ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + "Unexpected exception caught:"); + return 1; + } + ACE_ENDTRY; + + return 0; +} + diff --git a/TAO/examples/Multicast_Quoter/server.dsp b/TAO/examples/Multicast_Quoter/server.dsp new file mode 100644 index 00000000000..aa7f594c034 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/server.dsp @@ -0,0 +1,216 @@ +# Microsoft Developer Studio Project File - Name="Multicast Quoter Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Multicast Quoter Server - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "server.mak" CFG="Multicast Quoter Server - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Multicast Quoter Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multicast Quoter Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "Multicast Quoter Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "Multicast Quoter Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAO_PortableGroupd.lib TAO_PortableServerd.lib TAOd.lib aced.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableGroup" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Multicast Quoter Server - Win32 Release"
+# Name "Multicast Quoter Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QuoterC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QuoterS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\QuoterC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\QuoterS.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\QuoterC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\QuoterS.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\Quoter.idl
+
+!IF "$(CFG)" == "Multicast Quoter Server - Win32 Release"
+
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+# Begin Custom Build
+InputPath=.\Quoter.idl
+InputName=Quoter
+
+BuildCmds= \
+ ..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Multicast Quoter Server - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\Quoter.idl
+InputName=Quoter
+
+BuildCmds= \
+ ..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/examples/Multicast_Quoter/svc.conf b/TAO/examples/Multicast_Quoter/svc.conf new file mode 100644 index 00000000000..bd1c190f3a3 --- /dev/null +++ b/TAO/examples/Multicast_Quoter/svc.conf @@ -0,0 +1,3 @@ +dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" +static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" +#static PortableGroup_Loader "-MIOPDomainId MyDomain" diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index c9f21980fc2..a3e96b7edcb 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -72,12 +72,13 @@ TAO_GIOP_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV) ACE_CHECK; // Set the target specifier to point to the right kind - // of specifier for our request. Normally, this is just - // the object key. However, some pluggable have special - // requires such that the object key does not make the - // most sense. For example, MIOP requires the group id - // to be sent. - this->profile_->request_target_specifier (this->target_spec_); + // of specifier for our request. + this->profile_->request_target_specifier ( + this->target_spec_, + ACE_static_cast (TAO_Target_Specification::TAO_Target_Address, + this->stub_->addressing_mode ()), + ACE_TRY_ENV); + ACE_CHECK; } // ************************************************************************** diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index aa9faa3cace..27f493b4ca6 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -22,6 +22,7 @@ static const char corbaloc_prefix[] = "corbaloc:"; static const char iiop_prefix[] = "iiop:"; static const char uiop_prefix[] = "uiop:"; static const char shmiop_prefix[] = "shmiop:"; +static const char miop_prefix[] = "miop:"; static const char rir_prefix[] = "rir:"; int @@ -370,21 +371,25 @@ TAO_CORBALOC_Parser::check_prefix (const char *end_point, return -1; // Failure // Lets first check if it is a valid protocol: - if (!(ACE_OS::strncmp (end_point, + if (!((ACE_OS::strncmp (end_point, iiop_prefix, sizeof iiop_prefix - 1) == 0) || - (ACE_OS::strncmp (end_point, + (ACE_OS::strncmp (end_point, shmiop_prefix, sizeof shmiop_prefix - 1) == 0) || - (ACE_OS::strncmp (end_point, + (ACE_OS::strncmp (end_point, uiop_prefix, sizeof uiop_prefix - 1) == 0) || - (ACE_OS::strncmp (end_point, + (ACE_OS::strncmp (end_point, + miop_prefix, + sizeof miop_prefix - 1) == 0) || + + (ACE_OS::strncmp (end_point, rir_prefix, - sizeof rir_prefix - 1) == 0)) + sizeof rir_prefix - 1) == 0))) { ACE_ERROR ((LM_ERROR, diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl index eeaad9ddbc9..cd75ac30939 100644 --- a/TAO/tao/IOP.pidl +++ b/TAO/tao/IOP.pidl @@ -98,6 +98,7 @@ module IOP // InterORB Protocol (OMB TC Document orbos/2001-01-11) const ProfileId TAG_UIPMC = 0x54414f0c; // @@ Get real number const ComponentId TAG_GROUP = 0x54414f03; // @@ Get real number + const ComponentId TAG_GROUP_IIOP = 0x54414f04; // @@ Get real number local interface Codec { exception InvalidTypeForEncoding {}; diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 1098ba80cd0..e73e62f8a1c 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -312,14 +312,6 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) // Set the unique request ID associated with this request. this->op_details_.request_id (this->transport_->tms ()->request_id ()); - - // Set the target specifier to point to the right kind - // of specifier for our request. Normally, this is just - // the object key. However, some pluggable have special - // requires such that the object key does not make the - // most sense. For example, MIOP requires the group id - // to be sent. - this->profile_->request_target_specifier (this->target_spec_); } void @@ -341,52 +333,19 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags, this->add_rt_service_context (ACE_TRY_ENV); ACE_CHECK; -/* @@ Frank - I don't understand the purpose of this code. We just - set the target specification in TAO_GIOP_Invocation::start (). - - // The target specification mode - if (this->stub_->addressing_mode () == - TAO_Target_Specification::Key_Addr) - { - this->target_spec_.target_specifier ( - this->profile_->object_key ()); - } - else if (this->stub_->addressing_mode () - == TAO_Target_Specification::Profile_Addr) - { - this->target_spec_.target_specifier ( - this->profile_->create_tagged_profile () - ); - } - else if (this->stub_->addressing_mode () - == TAO_Target_Specification::Reference_Addr) - { - // We need to call the method seperately. If there is no - // IOP::IOR info, the call would create the info and return the - // index that we need. - CORBA::ULong index = 0; - - IOP::IOR *ior_info = 0; - int retval = this->stub_->create_ior_info (ior_info, - index, - ACE_TRY_ENV); - ACE_CHECK; - - if (retval == -1) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) Error in finding index for \n") - ACE_TEXT ("IOP::IOR \n"))); - } - return; - } + // Set the target specifier to point to the right kind + // of specifier for our request. Normally, this is just + // the object key. However, some pluggable have special + // requirements on what can actually be put in the target + // specification. For example, MIOP doesn't have an + // object key. + this->profile_->request_target_specifier ( + this->target_spec_, + ACE_static_cast (TAO_Target_Specification::TAO_Target_Address, + this->stub_->addressing_mode ()), + ACE_TRY_ENV); + ACE_CHECK; - this->target_spec_.target_specifier (*ior_info, - index); - } -*/ // Update the response flags this->op_details_.response_flags (response_flags); diff --git a/TAO/tao/PortableGroup/POA_Hooks.cpp b/TAO/tao/PortableGroup/POA_Hooks.cpp index 7c5d58fd238..c7e4fb05b89 100644 --- a/TAO/tao/PortableGroup/POA_Hooks.cpp +++ b/TAO/tao/PortableGroup/POA_Hooks.cpp @@ -36,7 +36,7 @@ TAO_POA_Hooks::create_id_for_reference ( CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )) { @@ -54,44 +54,11 @@ TAO_POA_Hooks::create_id_for_reference ( ACE_TRY_ENV); ACE_CHECK_RETURN (0); - // Create the acceptors necessary to receive requests for the - // specified group reference. - this->create_group_acceptors (the_ref, - this->portable_group_adapter_->acceptor_registry_, - the_poa.orb_core (), - ACE_TRY_ENV); - - ACE_CHECK_RETURN (0); - - // Find the Group Component. - PortableGroup::TagGroupTaggedComponent *tmp_group_id; - ACE_NEW_THROW_EX (tmp_group_id, - PortableGroup::TagGroupTaggedComponent, - CORBA::NO_MEMORY ( - CORBA::SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_NO)); - ACE_CHECK_RETURN (0); - - PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id; - - if (this->find_group_component (the_ref, group_id.inout ()) != 0) - { - // Group component wasn't found. The group reference - // that was passed in must be bogus. - ACE_THROW_RETURN (CORBA::INV_OBJREF (), - 0); - } - - const TAO_ObjectKey &key = obj_ref->_object_key (); - - // Add a mapping from GroupId to Object key in the PortableGroup - - this->portable_group_adapter_->group_map_.add_groupid_objectkey_pair ( - group_id._retn (), - key, - ACE_TRY_ENV); + // Associate the object reference with the group reference. + this->associate_group_with_ref (the_poa, + the_ref, + obj_ref.in (), + ACE_TRY_ENV); ACE_CHECK_RETURN (0); return obj_id._retn (); @@ -192,13 +159,103 @@ TAO_POA_Hooks::reference_to_ids ( CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )) { return 0; } +void +TAO_POA_Hooks::associate_group_with_ref ( + TAO_POA &the_poa, + CORBA::Object_ptr group_ref, + CORBA::Object_ptr obj_ref, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::NotAGroupObject)) +{ + // Find the Group Component so that we can extract the Group ID. + PortableGroup::TagGroupTaggedComponent *tmp_group_id; + ACE_NEW_THROW_EX (tmp_group_id, + PortableGroup::TagGroupTaggedComponent, + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id; + + if (this->find_group_component (group_ref, group_id.inout ()) != 0) + { + // Group component wasn't found. The group reference + // that was passed in must be bogus. + ACE_THROW (PortableServer::NotAGroupObject ()); + } + + // Create the acceptors necessary to receive requests for the + // specified group reference. + this->create_group_acceptors (group_ref, + this->portable_group_adapter_->acceptor_registry_, + the_poa.orb_core (), + ACE_TRY_ENV); + + ACE_CHECK; + + + // Add a mapping from GroupId to Object key in the PortableGroup + const TAO_ObjectKey &key = obj_ref->_object_key (); + this->portable_group_adapter_->group_map_.add_groupid_objectkey_pair ( + group_id._retn (), + key, + ACE_TRY_ENV); + ACE_CHECK; + +} + +void +TAO_POA_Hooks::associate_reference_with_id ( + TAO_POA &the_poa, + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )) +{ + + // Create a reference for the specified ObjectId, since + // it is much easier to extract the object key from the + // reference. + CORBA::Object_var obj_ref = the_poa.id_to_reference (oid, + ACE_TRY_ENV); + ACE_CHECK; + + // Associate the object reference with the group reference. + this->associate_group_with_ref (the_poa, + ref, + obj_ref.in (), + ACE_TRY_ENV); + ACE_CHECK; +} + +void +TAO_POA_Hooks::disassociate_reference_with_id ( + TAO_POA &the_poa, + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )) +{ + return; +} + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/PortableGroup/POA_Hooks.h b/TAO/tao/PortableGroup/POA_Hooks.h index 969a9068bfe..3efe54f6d00 100644 --- a/TAO/tao/PortableGroup/POA_Hooks.h +++ b/TAO/tao/PortableGroup/POA_Hooks.h @@ -49,22 +49,50 @@ public: virtual ~TAO_POA_Hooks (void); - virtual PortableServer::ObjectId *create_id_for_reference ( - TAO_POA &the_poa, - CORBA::Object_ptr the_ref, - CORBA::Environment &ACE_TRY_ENV) + virtual PortableServer::ObjectId * create_id_for_reference ( + TAO_POA &the_poa, + CORBA::Object_ptr the_ref, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject )); - virtual PortableServer::IDs *reference_to_ids ( - TAO_POA &the_poa, - CORBA::Object_ptr the_ref, - CORBA::Environment &ACE_TRY_ENV) + virtual PortableServer::IDs * reference_to_ids ( + TAO_POA &the_poa, + CORBA::Object_ptr the_ref, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) ACE_THROW_SPEC (( CORBA::SystemException, - PortableServer::POA::WrongAdapter + PortableServer::NotAGroupObject + )); + + virtual void associate_reference_with_id ( + TAO_POA &the_poa, + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject + )); + + virtual void disassociate_reference_with_id ( + TAO_POA &the_poa, + CORBA::Object_ptr ref, + const PortableServer::ObjectId & oid, + CORBA::Environment &ACE_TRY_ENV = + TAO_default_environment () + ) + ACE_THROW_SPEC (( + CORBA::SystemException, + PortableServer::NotAGroupObject )); protected: @@ -80,6 +108,16 @@ protected: TAO_ORB_Core &orb_core, CORBA::Environment &ACE_TRY_ENV); + /// Helper function to associate group references with + /// object references. + void associate_group_with_ref ( + TAO_POA &the_poa, + CORBA::Object_ptr group_ref, + CORBA::Object_ptr obj_ref, + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::NotAGroupObject)); + protected: /// Back pointer to the PortableGroup. diff --git a/TAO/tao/PortableGroup/PortableGroup.pidl b/TAO/tao/PortableGroup/PortableGroup.pidl index 65ddcf826b8..b64ce270fec 100644 --- a/TAO/tao/PortableGroup/PortableGroup.pidl +++ b/TAO/tao/PortableGroup/PortableGroup.pidl @@ -69,12 +69,15 @@ module PortableGroup { typedef unsigned long long ObjectGroupId; typedef unsigned long ObjectGroupRefVersion; + typedef GIOP::Version Version; + struct TagGroupTaggedComponent { // tag = TAG_GROUP; - GIOP::Version version; + Version component_version; GroupDomainId group_domain_id; ObjectGroupId object_group_id; ObjectGroupRefVersion object_group_ref_version; }; + typedef sequence <octet> GroupIIOPProfile; // tag = TAG_GROUP_IIOP // Specification of Common Types and Exceptions // for GroupManagement diff --git a/TAO/tao/PortableGroup/PortableGroupC.cpp b/TAO/tao/PortableGroup/PortableGroupC.cpp index daac61c0f0d..d49242d1ef2 100644 --- a/TAO/tao/PortableGroup/PortableGroupC.cpp +++ b/TAO/tao/PortableGroup/PortableGroupC.cpp @@ -40,23 +40,23 @@ static const CORBA::Long _oc_PortableGroup_GroupDomainId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4772), - ACE_NTOHL (0x6f757044), - ACE_NTOHL (0x6f6d6169), - ACE_NTOHL (0x6e49643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4772), + ACE_NTOHL (0x6f757044), + ACE_NTOHL (0x6f6d6169), + ACE_NTOHL (0x6e49643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/GroupDomainId:1.0 14, - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x70446f6d), - ACE_NTOHL (0x61696e49), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x70446f6d), + ACE_NTOHL (0x61696e49), ACE_NTOHL (0x64000000), // name = GroupDomainId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -77,21 +77,21 @@ static const CORBA::Long _oc_PortableGroup_ObjectGroupId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x7049643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x7049643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/ObjectGroupId:1.0 14, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744772), - ACE_NTOHL (0x6f757049), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744772), + ACE_NTOHL (0x6f757049), ACE_NTOHL (0x64000000), // name = ObjectGroupId CORBA::tk_ulonglong, @@ -114,25 +114,25 @@ static const CORBA::Long _oc_PortableGroup_ObjectGroupRefVersion[] = { TAO_ENCAP_BYTE_ORDER, // byte order 52, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x70526566), - ACE_NTOHL (0x56657273), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x70526566), + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/ObjectGroupRefVersion:1.0 22, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744772), - ACE_NTOHL (0x6f757052), - ACE_NTOHL (0x65665665), - ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744772), + ACE_NTOHL (0x6f757052), + ACE_NTOHL (0x65665665), + ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000), // name = ObjectGroupRefVersion CORBA::tk_ulong, @@ -151,149 +151,229 @@ TAO_NAMESPACE_BEGIN (PortableGroup) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectGroupRefVersion, &_tc_TAO_tc_PortableGroup_ObjectGroupRefVersion) TAO_NAMESPACE_END -static const CORBA::Long _oc_PortableGroup_TagGroupTaggedComponent[] = +static const CORBA::Long _oc_PortableGroup_Version[] = { TAO_ENCAP_BYTE_ORDER, // byte order - 54, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5461), - ACE_NTOHL (0x6747726f), - ACE_NTOHL (0x75705461), - ACE_NTOHL (0x67676564), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), - ACE_NTOHL (0x743a312e), - ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/TagGroupTaggedComponent:1.0 - 24, - ACE_NTOHL (0x54616747), - ACE_NTOHL (0x726f7570), - ACE_NTOHL (0x54616767), - ACE_NTOHL (0x6564436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e7400), // name = TagGroupTaggedComponent - 4, // member count + 38, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5665), + ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6e3a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/Version:1.0 8, - ACE_NTOHL (0x76657273), - ACE_NTOHL (0x696f6e00), // name = version + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e00), // name = Version CORBA::tk_struct, // typecode kind 88, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x47494f50), - ACE_NTOHL (0x2f566572), - ACE_NTOHL (0x73696f6e), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x2f566572), + ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/GIOP/Version:1.0 8, - ACE_NTOHL (0x56657273), + ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e00), // name = Version 2, // member count 6, - ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x6d616a6f), ACE_NTOHL (0x72000000), // name = major CORBA::tk_octet, 6, - ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x6d696e6f), ACE_NTOHL (0x72000000), // name = minor CORBA::tk_octet, +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableGroup_Version ( + CORBA::tk_alias, + sizeof (_oc_PortableGroup_Version), + (char *) &_oc_PortableGroup_Version, + 0, + sizeof (PortableGroup::Version) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableGroup) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Version, &_tc_TAO_tc_PortableGroup_Version) +TAO_NAMESPACE_END + +static const CORBA::Long _oc_PortableGroup_TagGroupTaggedComponent[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 54, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5461), + ACE_NTOHL (0x6747726f), + ACE_NTOHL (0x75705461), + ACE_NTOHL (0x67676564), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x743a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/TagGroupTaggedComponent:1.0 + 24, + ACE_NTOHL (0x54616747), + ACE_NTOHL (0x726f7570), + ACE_NTOHL (0x54616767), + ACE_NTOHL (0x6564436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e7400), // name = TagGroupTaggedComponent + 4, // member count + 18, + ACE_NTOHL (0x636f6d70), + ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x745f7665), + ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6e000000), // name = component_version + CORBA::tk_alias, // typecode kind for typedefs + 156, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 38, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5665), + ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x6e3a312e), + ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/Version:1.0 + 8, + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e00), // name = Version + CORBA::tk_struct, // typecode kind + 88, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + 29, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x47494f50), + ACE_NTOHL (0x2f566572), + ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x0), // repository ID = IDL:omg.org/GIOP/Version:1.0 + 8, + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e00), // name = Version + 2, // member count + 6, + ACE_NTOHL (0x6d616a6f), + ACE_NTOHL (0x72000000), // name = major + CORBA::tk_octet, + + 6, + ACE_NTOHL (0x6d696e6f), + ACE_NTOHL (0x72000000), // name = minor + CORBA::tk_octet, + + + 16, - ACE_NTOHL (0x67726f75), - ACE_NTOHL (0x705f646f), - ACE_NTOHL (0x6d61696e), + ACE_NTOHL (0x67726f75), + ACE_NTOHL (0x705f646f), + ACE_NTOHL (0x6d61696e), ACE_NTOHL (0x5f696400), // name = group_domain_id CORBA::tk_alias, // typecode kind for typedefs 80, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4772), - ACE_NTOHL (0x6f757044), - ACE_NTOHL (0x6f6d6169), - ACE_NTOHL (0x6e49643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4772), + ACE_NTOHL (0x6f757044), + ACE_NTOHL (0x6f6d6169), + ACE_NTOHL (0x6e49643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/GroupDomainId:1.0 14, - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x70446f6d), - ACE_NTOHL (0x61696e49), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x70446f6d), + ACE_NTOHL (0x61696e49), ACE_NTOHL (0x64000000), // name = GroupDomainId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 16, - ACE_NTOHL (0x6f626a65), - ACE_NTOHL (0x63745f67), - ACE_NTOHL (0x726f7570), + ACE_NTOHL (0x6f626a65), + ACE_NTOHL (0x63745f67), + ACE_NTOHL (0x726f7570), ACE_NTOHL (0x5f696400), // name = object_group_id CORBA::tk_alias, // typecode kind for typedefs 76, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 44, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x7049643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x7049643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/ObjectGroupId:1.0 14, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744772), - ACE_NTOHL (0x6f757049), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744772), + ACE_NTOHL (0x6f757049), ACE_NTOHL (0x64000000), // name = ObjectGroupId CORBA::tk_ulonglong, 25, - ACE_NTOHL (0x6f626a65), - ACE_NTOHL (0x63745f67), - ACE_NTOHL (0x726f7570), - ACE_NTOHL (0x5f726566), - ACE_NTOHL (0x5f766572), - ACE_NTOHL (0x73696f6e), + ACE_NTOHL (0x6f626a65), + ACE_NTOHL (0x63745f67), + ACE_NTOHL (0x726f7570), + ACE_NTOHL (0x5f726566), + ACE_NTOHL (0x5f766572), + ACE_NTOHL (0x73696f6e), ACE_NTOHL (0x0), // name = object_group_ref_version CORBA::tk_alias, // typecode kind for typedefs 92, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 52, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x70526566), - ACE_NTOHL (0x56657273), - ACE_NTOHL (0x696f6e3a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x70526566), + ACE_NTOHL (0x56657273), + ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/ObjectGroupRefVersion:1.0 22, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744772), - ACE_NTOHL (0x6f757052), - ACE_NTOHL (0x65665665), - ACE_NTOHL (0x7273696f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744772), + ACE_NTOHL (0x6f757052), + ACE_NTOHL (0x65665665), + ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000), // name = ObjectGroupRefVersion CORBA::tk_ulong, @@ -319,42 +399,134 @@ void PortableGroup::TagGroupTaggedComponent::_tao_any_destructor (void *x) delete tmp; } + +#if !defined (_PORTABLEGROUP_GROUPIIOPPROFILE_CS_) +#define _PORTABLEGROUP_GROUPIIOPPROFILE_CS_ + +// ************************************************************* +// PortableGroup::GroupIIOPProfile +// ************************************************************* + +PortableGroup::GroupIIOPProfile::GroupIIOPProfile (void) +{} +PortableGroup::GroupIIOPProfile::GroupIIOPProfile (CORBA::ULong max) // uses max size + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max) +{} +PortableGroup::GroupIIOPProfile::GroupIIOPProfile (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release) + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (max, length, buffer, release) +{} +PortableGroup::GroupIIOPProfile::GroupIIOPProfile (const GroupIIOPProfile &seq) // copy ctor + : +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + (seq) +{} +PortableGroup::GroupIIOPProfile::~GroupIIOPProfile (void) // dtor +{} +void PortableGroup::GroupIIOPProfile::_tao_any_destructor (void *x) +{ + GroupIIOPProfile *tmp = ACE_static_cast (GroupIIOPProfile*,x); + delete tmp; +} + + +#endif /* end #if !defined */ + +static const CORBA::Long _oc_PortableGroup_GroupIIOPProfile[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 47, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4772), + ACE_NTOHL (0x6f757049), + ACE_NTOHL (0x494f5050), + ACE_NTOHL (0x726f6669), + ACE_NTOHL (0x6c653a31), + ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/GroupIIOPProfile:1.0 + 17, + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x7049494f), + ACE_NTOHL (0x5050726f), + ACE_NTOHL (0x66696c65), + ACE_NTOHL (0x0), // name = GroupIIOPProfile + CORBA::tk_sequence, // typecode kind + 12, // encapsulation length + TAO_ENCAP_BYTE_ORDER, // byte order + CORBA::tk_octet, + + 0U, + +}; + +static CORBA::TypeCode _tc_TAO_tc_PortableGroup_GroupIIOPProfile ( + CORBA::tk_alias, + sizeof (_oc_PortableGroup_GroupIIOPProfile), + (char *) &_oc_PortableGroup_GroupIIOPProfile, + 0, + sizeof (PortableGroup::GroupIIOPProfile) + ); + +TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_BEGIN (PortableGroup) +TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_GroupIIOPProfile, &_tc_TAO_tc_PortableGroup_GroupIIOPProfile) +TAO_NAMESPACE_END + static const CORBA::Long _oc_PortableGroup_TypeId[] = { TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5479), - ACE_NTOHL (0x70654964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5479), + ACE_NTOHL (0x70654964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/TypeId:1.0 7, - ACE_NTOHL (0x54797065), + ACE_NTOHL (0x54797065), ACE_NTOHL (0x49640000), // name = TypeId CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0 13, - ACE_NTOHL (0x5265706f), - ACE_NTOHL (0x7369746f), - ACE_NTOHL (0x72794964), + ACE_NTOHL (0x5265706f), + ACE_NTOHL (0x7369746f), + ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length }; @@ -376,35 +548,35 @@ static const CORBA::Long _oc_PortableGroup_ObjectGroup[] = { TAO_ENCAP_BYTE_ORDER, // byte order 42, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x703a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x703a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/ObjectGroup:1.0 12, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744772), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744772), ACE_NTOHL (0x6f757000), // name = ObjectGroup CORBA::tk_objref, 52, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 29, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Object:1.0 7, - ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000), // name = Object }; @@ -426,32 +598,32 @@ static const CORBA::Long _oc_PortableGroup_Name[] = { TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -460,20 +632,20 @@ static const CORBA::Long _oc_PortableGroup_Name[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -482,41 +654,41 @@ static const CORBA::Long _oc_PortableGroup_Name[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -542,17 +714,17 @@ static const CORBA::Long _oc_PortableGroup_Value[] = { TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -575,19 +747,19 @@ static const CORBA::Long _oc_PortableGroup_Property[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Property:1.0 9, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727479), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727479), ACE_NTOHL (0x0), // name = Property 2, // member count 4, @@ -596,32 +768,32 @@ static const CORBA::Long _oc_PortableGroup_Property[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -630,20 +802,20 @@ static const CORBA::Long _oc_PortableGroup_Property[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -652,41 +824,41 @@ static const CORBA::Long _oc_PortableGroup_Property[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -700,17 +872,17 @@ static const CORBA::Long _oc_PortableGroup_Property[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -738,7 +910,7 @@ void PortableGroup::Property::_tao_any_destructor (void *x) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_PROPERTIES_CS_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_PROPERTIES_CS_ @@ -747,43 +919,43 @@ void PortableGroup::Property::_tao_any_destructor (void *x) { PortableGroup::Property* tmp = 0; tmp = _TAO_Unbounded_Sequence_PortableGroup_Properties::allocbuf (length); - + if (this->buffer_ != 0) { PortableGroup::Property *old = ACE_reinterpret_cast (PortableGroup::Property *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_PortableGroup_Properties::freebuf (old); - + } this->buffer_ = tmp; } - + void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + PortableGroup::Property *tmp = ACE_reinterpret_cast (PortableGroup::Property *,this->buffer_); - + _TAO_Unbounded_Sequence_PortableGroup_Properties::freebuf (tmp); this->buffer_ = 0; - } - + } + PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::~_TAO_Unbounded_Sequence_PortableGroup_Properties (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEGROUP_PROPERTIES_CS_) #define _PORTABLEGROUP_PROPERTIES_CS_ @@ -795,30 +967,30 @@ void PortableGroup::Property::_tao_any_destructor (void *x) PortableGroup::Properties::Properties (void) {} PortableGroup::Properties::Properties (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Properties #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::Property> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} PortableGroup::Properties::Properties (CORBA::ULong max, CORBA::ULong length, PortableGroup::Property *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Properties #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::Property> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} PortableGroup::Properties::Properties (const Properties &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Properties #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::Property> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} PortableGroup::Properties::~Properties (void) // dtor @@ -836,20 +1008,20 @@ static const CORBA::Long _oc_PortableGroup_Properties[] = { TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74696573), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74696573), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/Properties:1.0 11, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = Properties CORBA::tk_sequence, // typecode kind 552, // encapsulation length @@ -858,19 +1030,19 @@ static const CORBA::Long _oc_PortableGroup_Properties[] = 536, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Property:1.0 9, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727479), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727479), ACE_NTOHL (0x0), // name = Property 2, // member count 4, @@ -879,32 +1051,32 @@ static const CORBA::Long _oc_PortableGroup_Properties[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -913,20 +1085,20 @@ static const CORBA::Long _oc_PortableGroup_Properties[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -935,41 +1107,41 @@ static const CORBA::Long _oc_PortableGroup_Properties[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -983,17 +1155,17 @@ static const CORBA::Long _oc_PortableGroup_Properties[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -1020,50 +1192,50 @@ static const CORBA::Long _oc_PortableGroup_Location[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4c6f), - ACE_NTOHL (0x63617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4c6f), + ACE_NTOHL (0x63617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Location:1.0 9, - ACE_NTOHL (0x4c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x4c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = Location CORBA::tk_alias, // typecode kind for typedefs 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -1072,20 +1244,20 @@ static const CORBA::Long _oc_PortableGroup_Location[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -1094,41 +1266,41 @@ static const CORBA::Long _oc_PortableGroup_Location[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -1153,7 +1325,7 @@ TAO_NAMESPACE_END #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_LOCATIONS_CS_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_LOCATIONS_CS_ @@ -1162,43 +1334,43 @@ TAO_NAMESPACE_END { PortableGroup::Location* tmp = 0; tmp = _TAO_Unbounded_Sequence_PortableGroup_Locations::allocbuf (length); - + if (this->buffer_ != 0) { PortableGroup::Location *old = ACE_reinterpret_cast (PortableGroup::Location *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_PortableGroup_Locations::freebuf (old); - + } this->buffer_ = tmp; } - + void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + PortableGroup::Location *tmp = ACE_reinterpret_cast (PortableGroup::Location *,this->buffer_); - + _TAO_Unbounded_Sequence_PortableGroup_Locations::freebuf (tmp); this->buffer_ = 0; - } - + } + PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::~_TAO_Unbounded_Sequence_PortableGroup_Locations (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEGROUP_LOCATIONS_CS_) #define _PORTABLEGROUP_LOCATIONS_CS_ @@ -1210,30 +1382,30 @@ TAO_NAMESPACE_END PortableGroup::Locations::Locations (void) {} PortableGroup::Locations::Locations (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Locations #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::Location> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} PortableGroup::Locations::Locations (CORBA::ULong max, CORBA::ULong length, PortableGroup::Location *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Locations #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::Location> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} PortableGroup::Locations::Locations (const Locations &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Locations #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::Location> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} PortableGroup::Locations::~Locations (void) // dtor @@ -1251,19 +1423,19 @@ static const CORBA::Long _oc_PortableGroup_Locations[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4c6f), - ACE_NTOHL (0x63617469), - ACE_NTOHL (0x6f6e733a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4c6f), + ACE_NTOHL (0x63617469), + ACE_NTOHL (0x6f6e733a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Locations:1.0 10, - ACE_NTOHL (0x4c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x4c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x73000000), // name = Locations CORBA::tk_sequence, // typecode kind 464, // encapsulation length @@ -1272,50 +1444,50 @@ static const CORBA::Long _oc_PortableGroup_Locations[] = 448, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4c6f), - ACE_NTOHL (0x63617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4c6f), + ACE_NTOHL (0x63617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Location:1.0 9, - ACE_NTOHL (0x4c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x4c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = Location CORBA::tk_alias, // typecode kind for typedefs 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -1324,20 +1496,20 @@ static const CORBA::Long _oc_PortableGroup_Locations[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -1346,41 +1518,41 @@ static const CORBA::Long _oc_PortableGroup_Locations[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -1410,38 +1582,38 @@ static const CORBA::Long _oc_PortableGroup_Criteria[] = { TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4372), - ACE_NTOHL (0x69746572), - ACE_NTOHL (0x69613a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4372), + ACE_NTOHL (0x69746572), + ACE_NTOHL (0x69613a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Criteria:1.0 9, - ACE_NTOHL (0x43726974), - ACE_NTOHL (0x65726961), + ACE_NTOHL (0x43726974), + ACE_NTOHL (0x65726961), ACE_NTOHL (0x0), // name = Criteria CORBA::tk_alias, // typecode kind for typedefs 628, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74696573), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74696573), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/Properties:1.0 11, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = Properties CORBA::tk_sequence, // typecode kind 552, // encapsulation length @@ -1450,19 +1622,19 @@ static const CORBA::Long _oc_PortableGroup_Criteria[] = 536, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Property:1.0 9, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727479), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727479), ACE_NTOHL (0x0), // name = Property 2, // member count 4, @@ -1471,32 +1643,32 @@ static const CORBA::Long _oc_PortableGroup_Criteria[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -1505,20 +1677,20 @@ static const CORBA::Long _oc_PortableGroup_Criteria[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -1527,41 +1699,41 @@ static const CORBA::Long _oc_PortableGroup_Criteria[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -1575,17 +1747,17 @@ static const CORBA::Long _oc_PortableGroup_Criteria[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -1611,7 +1783,7 @@ TAO_NAMESPACE_END #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_FACTORYINFOS_CS_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_FACTORYINFOS_CS_ @@ -1620,43 +1792,43 @@ TAO_NAMESPACE_END { PortableGroup::FactoryInfo* tmp = 0; tmp = _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::allocbuf (length); - + if (this->buffer_ != 0) { PortableGroup::FactoryInfo *old = ACE_reinterpret_cast (PortableGroup::FactoryInfo *,this->buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp[i] = old[i]; - + if (this->release_) _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::freebuf (old); - + } this->buffer_ = tmp; } - + void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::_deallocate_buffer (void) { if (this->buffer_ == 0 || this->release_ == 0) return; - + PortableGroup::FactoryInfo *tmp = ACE_reinterpret_cast (PortableGroup::FactoryInfo *,this->buffer_); - + _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::freebuf (tmp); this->buffer_ = 0; - } - + } + PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::~_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (void) // Dtor. { this->_deallocate_buffer (); } - - + + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEGROUP_FACTORYINFOS_CS_) #define _PORTABLEGROUP_FACTORYINFOS_CS_ @@ -1668,30 +1840,30 @@ TAO_NAMESPACE_END PortableGroup::FactoryInfos::FactoryInfos (void) {} PortableGroup::FactoryInfos::FactoryInfos (CORBA::ULong max) // uses max size - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::FactoryInfo> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max) {} PortableGroup::FactoryInfos::FactoryInfos (CORBA::ULong max, CORBA::ULong length, PortableGroup::FactoryInfo *buffer, CORBA::Boolean release) - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::FactoryInfo> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (max, length, buffer, release) {} PortableGroup::FactoryInfos::FactoryInfos (const FactoryInfos &seq) // copy ctor - : + : #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<PortableGroup::FactoryInfo> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ (seq) {} PortableGroup::FactoryInfos::~FactoryInfos (void) // dtor @@ -1709,25 +1881,25 @@ static const CORBA::Long _oc_PortableGroup_MembershipStyleValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4d65), - ACE_NTOHL (0x6d626572), - ACE_NTOHL (0x73686970), - ACE_NTOHL (0x5374796c), - ACE_NTOHL (0x6556616c), - ACE_NTOHL (0x75653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4d65), + ACE_NTOHL (0x6d626572), + ACE_NTOHL (0x73686970), + ACE_NTOHL (0x5374796c), + ACE_NTOHL (0x6556616c), + ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/MembershipStyleValue:1.0 21, - ACE_NTOHL (0x4d656d62), - ACE_NTOHL (0x65727368), - ACE_NTOHL (0x69705374), - ACE_NTOHL (0x796c6556), - ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x4d656d62), + ACE_NTOHL (0x65727368), + ACE_NTOHL (0x69705374), + ACE_NTOHL (0x796c6556), + ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = MembershipStyleValue CORBA::tk_long, @@ -1758,28 +1930,28 @@ static const CORBA::Long _oc_PortableGroup_InitialNumberReplicasValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 57, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f496e), - ACE_NTOHL (0x69746961), - ACE_NTOHL (0x6c4e756d), - ACE_NTOHL (0x62657252), - ACE_NTOHL (0x65706c69), - ACE_NTOHL (0x63617356), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f496e), + ACE_NTOHL (0x69746961), + ACE_NTOHL (0x6c4e756d), + ACE_NTOHL (0x62657252), + ACE_NTOHL (0x65706c69), + ACE_NTOHL (0x63617356), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/InitialNumberReplicasValue:1.0 27, - ACE_NTOHL (0x496e6974), - ACE_NTOHL (0x69616c4e), - ACE_NTOHL (0x756d6265), - ACE_NTOHL (0x72526570), - ACE_NTOHL (0x6c696361), - ACE_NTOHL (0x7356616c), + ACE_NTOHL (0x496e6974), + ACE_NTOHL (0x69616c4e), + ACE_NTOHL (0x756d6265), + ACE_NTOHL (0x72526570), + ACE_NTOHL (0x6c696361), + ACE_NTOHL (0x7356616c), ACE_NTOHL (0x75650000), // name = InitialNumberReplicasValue CORBA::tk_ushort, @@ -1802,28 +1974,28 @@ static const CORBA::Long _oc_PortableGroup_MinimumNumberReplicasValue[] = { TAO_ENCAP_BYTE_ORDER, // byte order 57, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4d69), - ACE_NTOHL (0x6e696d75), - ACE_NTOHL (0x6d4e756d), - ACE_NTOHL (0x62657252), - ACE_NTOHL (0x65706c69), - ACE_NTOHL (0x63617356), - ACE_NTOHL (0x616c7565), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4d69), + ACE_NTOHL (0x6e696d75), + ACE_NTOHL (0x6d4e756d), + ACE_NTOHL (0x62657252), + ACE_NTOHL (0x65706c69), + ACE_NTOHL (0x63617356), + ACE_NTOHL (0x616c7565), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/MinimumNumberReplicasValue:1.0 27, - ACE_NTOHL (0x4d696e69), - ACE_NTOHL (0x6d756d4e), - ACE_NTOHL (0x756d6265), - ACE_NTOHL (0x72526570), - ACE_NTOHL (0x6c696361), - ACE_NTOHL (0x7356616c), + ACE_NTOHL (0x4d696e69), + ACE_NTOHL (0x6d756d4e), + ACE_NTOHL (0x756d6265), + ACE_NTOHL (0x72526570), + ACE_NTOHL (0x6c696361), + ACE_NTOHL (0x7356616c), ACE_NTOHL (0x75650000), // name = MinimumNumberReplicasValue CORBA::tk_ushort, @@ -1901,7 +2073,7 @@ void PortableGroup::InterfaceNotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -1914,7 +2086,7 @@ void PortableGroup::InterfaceNotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -1930,23 +2102,23 @@ static const CORBA::Long _oc_PortableGroup_InterfaceNotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 48, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f496e), - ACE_NTOHL (0x74657266), - ACE_NTOHL (0x6163654e), - ACE_NTOHL (0x6f74466f), - ACE_NTOHL (0x756e643a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f496e), + ACE_NTOHL (0x74657266), + ACE_NTOHL (0x6163654e), + ACE_NTOHL (0x6f74466f), + ACE_NTOHL (0x756e643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/InterfaceNotFound:1.0 18, - ACE_NTOHL (0x496e7465), - ACE_NTOHL (0x72666163), - ACE_NTOHL (0x654e6f74), - ACE_NTOHL (0x466f756e), + ACE_NTOHL (0x496e7465), + ACE_NTOHL (0x72666163), + ACE_NTOHL (0x654e6f74), + ACE_NTOHL (0x466f756e), ACE_NTOHL (0x64000000), // name = InterfaceNotFound 0, // member count }; @@ -2030,7 +2202,7 @@ void PortableGroup::ObjectGroupNotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2043,7 +2215,7 @@ void PortableGroup::ObjectGroupNotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2059,24 +2231,24 @@ static const CORBA::Long _oc_PortableGroup_ObjectGroupNotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 50, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x704e6f74), - ACE_NTOHL (0x466f756e), - ACE_NTOHL (0x643a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x704e6f74), + ACE_NTOHL (0x466f756e), + ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/ObjectGroupNotFound:1.0 20, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744772), - ACE_NTOHL (0x6f75704e), - ACE_NTOHL (0x6f74466f), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744772), + ACE_NTOHL (0x6f75704e), + ACE_NTOHL (0x6f74466f), ACE_NTOHL (0x756e6400), // name = ObjectGroupNotFound 0, // member count }; @@ -2160,7 +2332,7 @@ void PortableGroup::MemberNotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2173,7 +2345,7 @@ void PortableGroup::MemberNotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2189,22 +2361,22 @@ static const CORBA::Long _oc_PortableGroup_MemberNotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4d65), - ACE_NTOHL (0x6d626572), - ACE_NTOHL (0x4e6f7446), - ACE_NTOHL (0x6f756e64), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4d65), + ACE_NTOHL (0x6d626572), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/MemberNotFound:1.0 15, - ACE_NTOHL (0x4d656d62), - ACE_NTOHL (0x65724e6f), - ACE_NTOHL (0x74466f75), + ACE_NTOHL (0x4d656d62), + ACE_NTOHL (0x65724e6f), + ACE_NTOHL (0x74466f75), ACE_NTOHL (0x6e640000), // name = MemberNotFound 0, // member count }; @@ -2288,7 +2460,7 @@ void PortableGroup::ObjectNotFound::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2301,7 +2473,7 @@ void PortableGroup::ObjectNotFound::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2317,22 +2489,22 @@ static const CORBA::Long _oc_PortableGroup_ObjectNotFound[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x4e6f7446), - ACE_NTOHL (0x6f756e64), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x4e6f7446), + ACE_NTOHL (0x6f756e64), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/ObjectNotFound:1.0 15, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744e6f), - ACE_NTOHL (0x74466f75), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744e6f), + ACE_NTOHL (0x74466f75), ACE_NTOHL (0x6e640000), // name = ObjectNotFound 0, // member count }; @@ -2416,7 +2588,7 @@ void PortableGroup::MemberAlreadyPresent::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2429,7 +2601,7 @@ void PortableGroup::MemberAlreadyPresent::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2445,25 +2617,25 @@ static const CORBA::Long _oc_PortableGroup_MemberAlreadyPresent[] = { TAO_ENCAP_BYTE_ORDER, // byte order 51, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4d65), - ACE_NTOHL (0x6d626572), - ACE_NTOHL (0x416c7265), - ACE_NTOHL (0x61647950), - ACE_NTOHL (0x72657365), - ACE_NTOHL (0x6e743a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4d65), + ACE_NTOHL (0x6d626572), + ACE_NTOHL (0x416c7265), + ACE_NTOHL (0x61647950), + ACE_NTOHL (0x72657365), + ACE_NTOHL (0x6e743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/MemberAlreadyPresent:1.0 21, - ACE_NTOHL (0x4d656d62), - ACE_NTOHL (0x6572416c), - ACE_NTOHL (0x72656164), - ACE_NTOHL (0x79507265), - ACE_NTOHL (0x73656e74), + ACE_NTOHL (0x4d656d62), + ACE_NTOHL (0x6572416c), + ACE_NTOHL (0x72656164), + ACE_NTOHL (0x79507265), + ACE_NTOHL (0x73656e74), ACE_NTOHL (0x0), // name = MemberAlreadyPresent 0, // member count }; @@ -2547,7 +2719,7 @@ void PortableGroup::BadReplicationStyle::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2560,7 +2732,7 @@ void PortableGroup::BadReplicationStyle::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2576,24 +2748,24 @@ static const CORBA::Long _oc_PortableGroup_BadReplicationStyle[] = { TAO_ENCAP_BYTE_ORDER, // byte order 50, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4261), - ACE_NTOHL (0x64526570), - ACE_NTOHL (0x6c696361), - ACE_NTOHL (0x74696f6e), - ACE_NTOHL (0x5374796c), - ACE_NTOHL (0x653a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4261), + ACE_NTOHL (0x64526570), + ACE_NTOHL (0x6c696361), + ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x5374796c), + ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/BadReplicationStyle:1.0 20, - ACE_NTOHL (0x42616452), - ACE_NTOHL (0x65706c69), - ACE_NTOHL (0x63617469), - ACE_NTOHL (0x6f6e5374), + ACE_NTOHL (0x42616452), + ACE_NTOHL (0x65706c69), + ACE_NTOHL (0x63617469), + ACE_NTOHL (0x6f6e5374), ACE_NTOHL (0x796c6500), // name = BadReplicationStyle 0, // member count }; @@ -2677,7 +2849,7 @@ void PortableGroup::ObjectNotCreated::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2690,7 +2862,7 @@ void PortableGroup::ObjectNotCreated::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2706,23 +2878,23 @@ static const CORBA::Long _oc_PortableGroup_ObjectNotCreated[] = { TAO_ENCAP_BYTE_ORDER, // byte order 47, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x4e6f7443), - ACE_NTOHL (0x72656174), - ACE_NTOHL (0x65643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x4e6f7443), + ACE_NTOHL (0x72656174), + ACE_NTOHL (0x65643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/ObjectNotCreated:1.0 17, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744e6f), - ACE_NTOHL (0x74437265), - ACE_NTOHL (0x61746564), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744e6f), + ACE_NTOHL (0x74437265), + ACE_NTOHL (0x61746564), ACE_NTOHL (0x0), // name = ObjectNotCreated 0, // member count }; @@ -2806,7 +2978,7 @@ void PortableGroup::ObjectNotAdded::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2819,7 +2991,7 @@ void PortableGroup::ObjectNotAdded::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2835,22 +3007,22 @@ static const CORBA::Long _oc_PortableGroup_ObjectNotAdded[] = { TAO_ENCAP_BYTE_ORDER, // byte order 45, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4f62), - ACE_NTOHL (0x6a656374), - ACE_NTOHL (0x4e6f7441), - ACE_NTOHL (0x64646564), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4f62), + ACE_NTOHL (0x6a656374), + ACE_NTOHL (0x4e6f7441), + ACE_NTOHL (0x64646564), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/ObjectNotAdded:1.0 15, - ACE_NTOHL (0x4f626a65), - ACE_NTOHL (0x63744e6f), - ACE_NTOHL (0x74416464), + ACE_NTOHL (0x4f626a65), + ACE_NTOHL (0x63744e6f), + ACE_NTOHL (0x74416464), ACE_NTOHL (0x65640000), // name = ObjectNotAdded 0, // member count }; @@ -2936,7 +3108,7 @@ void PortableGroup::UnsupportedProperty::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2949,7 +3121,7 @@ void PortableGroup::UnsupportedProperty::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -2973,24 +3145,24 @@ static const CORBA::Long _oc_PortableGroup_UnsupportedProperty[] = { TAO_ENCAP_BYTE_ORDER, // byte order 50, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f556e), - ACE_NTOHL (0x73757070), - ACE_NTOHL (0x6f727465), - ACE_NTOHL (0x6450726f), - ACE_NTOHL (0x70657274), - ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f556e), + ACE_NTOHL (0x73757070), + ACE_NTOHL (0x6f727465), + ACE_NTOHL (0x6450726f), + ACE_NTOHL (0x70657274), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/UnsupportedProperty:1.0 20, - ACE_NTOHL (0x556e7375), - ACE_NTOHL (0x70706f72), - ACE_NTOHL (0x74656450), - ACE_NTOHL (0x726f7065), + ACE_NTOHL (0x556e7375), + ACE_NTOHL (0x70706f72), + ACE_NTOHL (0x74656450), + ACE_NTOHL (0x726f7065), ACE_NTOHL (0x72747900), // name = UnsupportedProperty 1, // member count 4, @@ -2999,32 +3171,32 @@ static const CORBA::Long _oc_PortableGroup_UnsupportedProperty[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -3033,20 +3205,20 @@ static const CORBA::Long _oc_PortableGroup_UnsupportedProperty[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -3055,41 +3227,41 @@ static const CORBA::Long _oc_PortableGroup_UnsupportedProperty[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -3182,7 +3354,7 @@ void PortableGroup::InvalidProperty::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -3195,7 +3367,7 @@ void PortableGroup::InvalidProperty::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -3221,22 +3393,22 @@ static const CORBA::Long _oc_PortableGroup_InvalidProperty[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x6450726f), - ACE_NTOHL (0x70657274), - ACE_NTOHL (0x793a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f496e), + ACE_NTOHL (0x76616c69), + ACE_NTOHL (0x6450726f), + ACE_NTOHL (0x70657274), + ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/InvalidProperty:1.0 16, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696450), - ACE_NTOHL (0x726f7065), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696450), + ACE_NTOHL (0x726f7065), ACE_NTOHL (0x72747900), // name = InvalidProperty 2, // member count 4, @@ -3245,32 +3417,32 @@ static const CORBA::Long _oc_PortableGroup_InvalidProperty[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -3279,20 +3451,20 @@ static const CORBA::Long _oc_PortableGroup_InvalidProperty[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -3301,41 +3473,41 @@ static const CORBA::Long _oc_PortableGroup_InvalidProperty[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -3349,17 +3521,17 @@ static const CORBA::Long _oc_PortableGroup_InvalidProperty[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -3449,7 +3621,7 @@ void PortableGroup::NoFactory::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -3462,7 +3634,7 @@ void PortableGroup::NoFactory::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -3488,74 +3660,74 @@ static const CORBA::Long _oc_PortableGroup_NoFactory[] = { TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e6f), - ACE_NTOHL (0x46616374), - ACE_NTOHL (0x6f72793a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e6f), + ACE_NTOHL (0x46616374), + ACE_NTOHL (0x6f72793a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/NoFactory:1.0 10, - ACE_NTOHL (0x4e6f4661), - ACE_NTOHL (0x63746f72), + ACE_NTOHL (0x4e6f4661), + ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000), // name = NoFactory 2, // member count 13, - ACE_NTOHL (0x7468655f), - ACE_NTOHL (0x6c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x7468655f), + ACE_NTOHL (0x6c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = the_location CORBA::tk_alias, // typecode kind for typedefs 448, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4c6f), - ACE_NTOHL (0x63617469), - ACE_NTOHL (0x6f6e3a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4c6f), + ACE_NTOHL (0x63617469), + ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Location:1.0 9, - ACE_NTOHL (0x4c6f6361), - ACE_NTOHL (0x74696f6e), + ACE_NTOHL (0x4c6f6361), + ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = Location CORBA::tk_alias, // typecode kind for typedefs 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -3564,20 +3736,20 @@ static const CORBA::Long _oc_PortableGroup_NoFactory[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -3586,41 +3758,41 @@ static const CORBA::Long _oc_PortableGroup_NoFactory[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -3630,44 +3802,44 @@ static const CORBA::Long _oc_PortableGroup_NoFactory[] = 8, - ACE_NTOHL (0x74797065), + ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400), // name = type_id CORBA::tk_alias, // typecode kind for typedefs 140, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 37, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5479), - ACE_NTOHL (0x70654964), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5479), + ACE_NTOHL (0x70654964), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/TypeId:1.0 7, - ACE_NTOHL (0x54797065), + ACE_NTOHL (0x54797065), ACE_NTOHL (0x49640000), // name = TypeId CORBA::tk_alias, // typecode kind for typedefs 72, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x434f5242), - ACE_NTOHL (0x412f5265), - ACE_NTOHL (0x706f7369), - ACE_NTOHL (0x746f7279), - ACE_NTOHL (0x49643a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x434f5242), + ACE_NTOHL (0x412f5265), + ACE_NTOHL (0x706f7369), + ACE_NTOHL (0x746f7279), + ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0 13, - ACE_NTOHL (0x5265706f), - ACE_NTOHL (0x7369746f), - ACE_NTOHL (0x72794964), + ACE_NTOHL (0x5265706f), + ACE_NTOHL (0x7369746f), + ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -3754,7 +3926,7 @@ void PortableGroup::InvalidCriteria::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -3767,7 +3939,7 @@ void PortableGroup::InvalidCriteria::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -3791,66 +3963,66 @@ static const CORBA::Long _oc_PortableGroup_InvalidCriteria[] = { TAO_ENCAP_BYTE_ORDER, // byte order 46, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f496e), - ACE_NTOHL (0x76616c69), - ACE_NTOHL (0x64437269), - ACE_NTOHL (0x74657269), - ACE_NTOHL (0x613a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f496e), + ACE_NTOHL (0x76616c69), + ACE_NTOHL (0x64437269), + ACE_NTOHL (0x74657269), + ACE_NTOHL (0x613a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/PortableGroup/InvalidCriteria:1.0 16, - ACE_NTOHL (0x496e7661), - ACE_NTOHL (0x6c696443), - ACE_NTOHL (0x72697465), + ACE_NTOHL (0x496e7661), + ACE_NTOHL (0x6c696443), + ACE_NTOHL (0x72697465), ACE_NTOHL (0x72696100), // name = InvalidCriteria 1, // member count 17, - ACE_NTOHL (0x696e7661), - ACE_NTOHL (0x6c69645f), - ACE_NTOHL (0x63726974), - ACE_NTOHL (0x65726961), + ACE_NTOHL (0x696e7661), + ACE_NTOHL (0x6c69645f), + ACE_NTOHL (0x63726974), + ACE_NTOHL (0x65726961), ACE_NTOHL (0x0), // name = invalid_criteria CORBA::tk_alias, // typecode kind for typedefs 700, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4372), - ACE_NTOHL (0x69746572), - ACE_NTOHL (0x69613a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4372), + ACE_NTOHL (0x69746572), + ACE_NTOHL (0x69613a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Criteria:1.0 9, - ACE_NTOHL (0x43726974), - ACE_NTOHL (0x65726961), + ACE_NTOHL (0x43726974), + ACE_NTOHL (0x65726961), ACE_NTOHL (0x0), // name = Criteria CORBA::tk_alias, // typecode kind for typedefs 628, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74696573), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74696573), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/Properties:1.0 11, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = Properties CORBA::tk_sequence, // typecode kind 552, // encapsulation length @@ -3859,19 +4031,19 @@ static const CORBA::Long _oc_PortableGroup_InvalidCriteria[] = 536, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Property:1.0 9, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727479), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727479), ACE_NTOHL (0x0), // name = Property 2, // member count 4, @@ -3880,32 +4052,32 @@ static const CORBA::Long _oc_PortableGroup_InvalidCriteria[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -3914,20 +4086,20 @@ static const CORBA::Long _oc_PortableGroup_InvalidCriteria[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -3936,41 +4108,41 @@ static const CORBA::Long _oc_PortableGroup_InvalidCriteria[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -3984,17 +4156,17 @@ static const CORBA::Long _oc_PortableGroup_InvalidCriteria[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -4087,7 +4259,7 @@ void PortableGroup::CannotMeetCriteria::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -4100,7 +4272,7 @@ void PortableGroup::CannotMeetCriteria::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -4124,67 +4296,67 @@ static const CORBA::Long _oc_PortableGroup_CannotMeetCriteria[] = { TAO_ENCAP_BYTE_ORDER, // byte order 49, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4361), - ACE_NTOHL (0x6e6e6f74), - ACE_NTOHL (0x4d656574), - ACE_NTOHL (0x43726974), - ACE_NTOHL (0x65726961), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4361), + ACE_NTOHL (0x6e6e6f74), + ACE_NTOHL (0x4d656574), + ACE_NTOHL (0x43726974), + ACE_NTOHL (0x65726961), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/CannotMeetCriteria:1.0 19, - ACE_NTOHL (0x43616e6e), - ACE_NTOHL (0x6f744d65), - ACE_NTOHL (0x65744372), - ACE_NTOHL (0x69746572), + ACE_NTOHL (0x43616e6e), + ACE_NTOHL (0x6f744d65), + ACE_NTOHL (0x65744372), + ACE_NTOHL (0x69746572), ACE_NTOHL (0x69610000), // name = CannotMeetCriteria 1, // member count 15, - ACE_NTOHL (0x756e6d65), - ACE_NTOHL (0x745f6372), - ACE_NTOHL (0x69746572), + ACE_NTOHL (0x756e6d65), + ACE_NTOHL (0x745f6372), + ACE_NTOHL (0x69746572), ACE_NTOHL (0x69610000), // name = unmet_criteria CORBA::tk_alias, // typecode kind for typedefs 700, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4372), - ACE_NTOHL (0x69746572), - ACE_NTOHL (0x69613a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4372), + ACE_NTOHL (0x69746572), + ACE_NTOHL (0x69613a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Criteria:1.0 9, - ACE_NTOHL (0x43726974), - ACE_NTOHL (0x65726961), + ACE_NTOHL (0x43726974), + ACE_NTOHL (0x65726961), ACE_NTOHL (0x0), // name = Criteria CORBA::tk_alias, // typecode kind for typedefs 628, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 41, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74696573), - ACE_NTOHL (0x3a312e30), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74696573), + ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/PortableGroup/Properties:1.0 11, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727469), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727469), ACE_NTOHL (0x65730000), // name = Properties CORBA::tk_sequence, // typecode kind 552, // encapsulation length @@ -4193,19 +4365,19 @@ static const CORBA::Long _oc_PortableGroup_CannotMeetCriteria[] = 536, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 39, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5072), - ACE_NTOHL (0x6f706572), - ACE_NTOHL (0x74793a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5072), + ACE_NTOHL (0x6f706572), + ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Property:1.0 9, - ACE_NTOHL (0x50726f70), - ACE_NTOHL (0x65727479), + ACE_NTOHL (0x50726f70), + ACE_NTOHL (0x65727479), ACE_NTOHL (0x0), // name = Property 2, // member count 4, @@ -4214,32 +4386,32 @@ static const CORBA::Long _oc_PortableGroup_CannotMeetCriteria[] = 376, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 35, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/PortableGroup/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_alias, // typecode kind for typedefs 312, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 31, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d653a31), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CosNaming/Name:1.0 5, - ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x0), // name = Name CORBA::tk_sequence, // typecode kind 252, // encapsulation length @@ -4248,20 +4420,20 @@ static const CORBA::Long _oc_PortableGroup_CannotMeetCriteria[] = 236, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 40, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4e61), - ACE_NTOHL (0x6d65436f), - ACE_NTOHL (0x6d706f6e), - ACE_NTOHL (0x656e743a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4e61), + ACE_NTOHL (0x6d65436f), + ACE_NTOHL (0x6d706f6e), + ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CosNaming/NameComponent:1.0 14, - ACE_NTOHL (0x4e616d65), - ACE_NTOHL (0x436f6d70), - ACE_NTOHL (0x6f6e656e), + ACE_NTOHL (0x4e616d65), + ACE_NTOHL (0x436f6d70), + ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = NameComponent 2, // member count 3, @@ -4270,41 +4442,41 @@ static const CORBA::Long _oc_PortableGroup_CannotMeetCriteria[] = 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length 5, - ACE_NTOHL (0x6b696e64), + ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind CORBA::tk_alias, // typecode kind for typedefs 64, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 34, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x436f734e), - ACE_NTOHL (0x616d696e), - ACE_NTOHL (0x672f4973), - ACE_NTOHL (0x7472696e), - ACE_NTOHL (0x673a312e), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x436f734e), + ACE_NTOHL (0x616d696e), + ACE_NTOHL (0x672f4973), + ACE_NTOHL (0x7472696e), + ACE_NTOHL (0x673a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CosNaming/Istring:1.0 8, - ACE_NTOHL (0x49737472), + ACE_NTOHL (0x49737472), ACE_NTOHL (0x696e6700), // name = Istring - CORBA::tk_string, + CORBA::tk_string, 0U, // string length @@ -4318,17 +4490,17 @@ static const CORBA::Long _oc_PortableGroup_CannotMeetCriteria[] = 60, // encapsulation length TAO_ENCAP_BYTE_ORDER, // byte order 36, - ACE_NTOHL (0x49444c3a), - ACE_NTOHL (0x6f6d672e), - ACE_NTOHL (0x6f72672f), - ACE_NTOHL (0x506f7274), - ACE_NTOHL (0x61626c65), - ACE_NTOHL (0x47726f75), - ACE_NTOHL (0x702f5661), - ACE_NTOHL (0x6c75653a), + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x47726f75), + ACE_NTOHL (0x702f5661), + ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/PortableGroup/Value:1.0 6, - ACE_NTOHL (0x56616c75), + ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000), // name = Value CORBA::tk_any, @@ -4451,7 +4623,7 @@ PortableGroup::PropertyManager_var::operator const ::PortableGroup::PropertyMana return this->ptr_; } -PortableGroup::PropertyManager_var::operator ::PortableGroup::PropertyManager_ptr &() // cast +PortableGroup::PropertyManager_var::operator ::PortableGroup::PropertyManager_ptr &() // cast { return this->ptr_; } @@ -4643,7 +4815,7 @@ void *PortableGroup::PropertyManager::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -4745,7 +4917,7 @@ PortableGroup::ObjectGroupManager_var::operator const ::PortableGroup::ObjectGro return this->ptr_; } -PortableGroup::ObjectGroupManager_var::operator ::PortableGroup::ObjectGroupManager_ptr &() // cast +PortableGroup::ObjectGroupManager_var::operator ::PortableGroup::ObjectGroupManager_ptr &() // cast { return this->ptr_; } @@ -4937,7 +5109,7 @@ void *PortableGroup::ObjectGroupManager::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -5039,7 +5211,7 @@ PortableGroup::GenericFactory_var::operator const ::PortableGroup::GenericFactor return this->ptr_; } -PortableGroup::GenericFactory_var::operator ::PortableGroup::GenericFactory_ptr &() // cast +PortableGroup::GenericFactory_var::operator ::PortableGroup::GenericFactory_ptr &() // cast { return this->ptr_; } @@ -5231,7 +5403,7 @@ void *PortableGroup::GenericFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -5278,13 +5450,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Tag ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_TagGroupTaggedComponent, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -5325,6 +5497,97 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Tag return 0; } +void operator<<= ( + CORBA::Any &_tao_any, + const PortableGroup::GroupIIOPProfile &_tao_elem + ) // copying +{ + TAO_OutputCDR stream; + if (stream << _tao_elem) + { + _tao_any._tao_replace ( + PortableGroup::_tc_GroupIIOPProfile, + TAO_ENCAP_BYTE_ORDER, + stream.begin () + ); + } +} + +void operator<<= (CORBA::Any &_tao_any, PortableGroup::GroupIIOPProfile *_tao_elem) // non copying +{ + TAO_OutputCDR stream; + stream << *_tao_elem; + _tao_any._tao_replace ( + PortableGroup::_tc_GroupIIOPProfile, + TAO_ENCAP_BYTE_ORDER, + stream.begin (), + 1, + _tao_elem, + PortableGroup::GroupIIOPProfile::_tao_any_destructor + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableGroup::GroupIIOPProfile *&_tao_elem) +{ + return _tao_any >>= ACE_const_cast( + const PortableGroup::GroupIIOPProfile*&, + _tao_elem + ); +} + +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::GroupIIOPProfile *&_tao_elem) +{ + _tao_elem = 0; + ACE_TRY_NEW_ENV + { + CORBA::TypeCode_var type = _tao_any.type (); + + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_GroupIIOPProfile, ACE_TRY_ENV); + ACE_TRY_CHECK; + + if (!result) + return 0; // not equivalent + + if (_tao_any.any_owns_data ()) + { + _tao_elem = ACE_static_cast( + const PortableGroup::GroupIIOPProfile*, + _tao_any.value () + ); + return 1; + } + else + { + PortableGroup::GroupIIOPProfile *tmp; + ACE_NEW_RETURN (tmp, PortableGroup::GroupIIOPProfile, 0); + TAO_InputCDR stream ( + _tao_any._tao_get_cdr (), + _tao_any._tao_byte_order () + ); + if (stream >> *tmp) + { + ((CORBA::Any *)&_tao_any)->_tao_replace ( + PortableGroup::_tc_GroupIIOPProfile, + 1, + ACE_static_cast (void *, tmp), + PortableGroup::GroupIIOPProfile::_tao_any_destructor + ); + _tao_elem = tmp; + return 1; + } + else + { + delete tmp; + } + } + } + ACE_CATCHANY + { + } + ACE_ENDTRY; + return 0; +} + void operator<<= (CORBA::Any &_tao_any, const PortableGroup::Property &_tao_elem) // copying { TAO_OutputCDR stream; @@ -5361,13 +5624,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Pro ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_Property, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -5452,13 +5715,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Pro ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_Properties, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -5543,13 +5806,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Loc ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_Locations, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = ACE_static_cast( @@ -5629,13 +5892,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Int ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_InterfaceNotFound, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::InterfaceNotFound *)_tao_any.value (); @@ -5719,13 +5982,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Obj ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_ObjectGroupNotFound, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::ObjectGroupNotFound *)_tao_any.value (); @@ -5809,13 +6072,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Mem ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_MemberNotFound, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::MemberNotFound *)_tao_any.value (); @@ -5899,13 +6162,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Obj ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_ObjectNotFound, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::ObjectNotFound *)_tao_any.value (); @@ -5989,13 +6252,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Mem ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_MemberAlreadyPresent, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::MemberAlreadyPresent *)_tao_any.value (); @@ -6079,13 +6342,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Bad ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_BadReplicationStyle, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::BadReplicationStyle *)_tao_any.value (); @@ -6169,13 +6432,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Obj ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_ObjectNotCreated, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::ObjectNotCreated *)_tao_any.value (); @@ -6259,13 +6522,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Obj ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_ObjectNotAdded, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::ObjectNotAdded *)_tao_any.value (); @@ -6349,13 +6612,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Uns ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_UnsupportedProperty, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::UnsupportedProperty *)_tao_any.value (); @@ -6439,13 +6702,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Inv ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_InvalidProperty, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::InvalidProperty *)_tao_any.value (); @@ -6529,13 +6792,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::NoF ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_NoFactory, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::NoFactory *)_tao_any.value (); @@ -6619,13 +6882,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Inv ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_InvalidCriteria, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::InvalidCriteria *)_tao_any.value (); @@ -6709,13 +6972,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Can ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - + CORBA::Boolean result = type->equivalent (PortableGroup::_tc_CannotMeetCriteria, ACE_TRY_ENV); ACE_TRY_CHECK; - + if (!result) return 0; // not equivalent - + if (_tao_any.any_owns_data ()) { _tao_elem = (PortableGroup::CannotMeetCriteria *)_tao_any.value (); @@ -6783,6 +7046,79 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableGroup::Can CORBA::Boolean operator<< ( TAO_OutputCDR &strm, + const PortableGroup::GroupIIOPProfile &_tao_sequence + ) +{ + if (strm << _tao_sequence.length ()) + { + // encode all elements + +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + { + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableGroup::GroupIIOPProfile *)&_tao_sequence); + if (oseq->mb ()) + return strm.write_octet_array_mb (oseq->mb ()); + else + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + } + +#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ + return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + +#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ + } + return 0; // error +} + +CORBA::Boolean operator>> ( + TAO_InputCDR &strm, + PortableGroup::GroupIIOPProfile &_tao_sequence + ) +{ + CORBA::ULong _tao_seq_len; + if (strm >> _tao_seq_len) + { + // set the length of the sequence + _tao_sequence.length (_tao_seq_len); + // If length is 0 we return true. + if (0 >= _tao_seq_len) + return 1; + // Add a check to the length of the sequence + // to make sure it does not exceed the length + // of the stream. (See bug 58.) + if (_tao_seq_len > strm.length()) + return 0; + // retrieve all the elements + +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + if (ACE_BIT_DISABLED (strm.start ()->flags (), + ACE_Message_Block::DONT_DELETE)) + { + TAO_ORB_Core* orb_core = strm.orb_core (); + if (orb_core != 0 && + strm.orb_core ()->resource_factory ()-> + input_cdr_allocator_type_locked () == 1) + { + TAO_Unbounded_Sequence<CORBA::Octet> *oseq = + ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence); + oseq->replace (_tao_seq_len, strm.start ()); + oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len); + strm.skip_bytes (_tao_seq_len); + return 1; + } + } + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len); +#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ + return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); + +#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */ + } + return 0; // error +} + +CORBA::Boolean operator<< ( + TAO_OutputCDR &strm, const PortableGroup::Properties &_tao_sequence ) { @@ -6810,7 +7146,7 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length @@ -6857,7 +7193,7 @@ CORBA::Boolean operator>> ( // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. - if (0 >= _tao_seq_len) + if (0 >= _tao_seq_len) return 1; // Add a check to the length of the sequence // to make sure it does not exceed the length diff --git a/TAO/tao/PortableGroup/PortableGroupC.h b/TAO/tao/PortableGroup/PortableGroupC.h index 00db570a9ba..7ddd2611f8f 100644 --- a/TAO/tao/PortableGroup/PortableGroupC.h +++ b/TAO/tao/PortableGroup/PortableGroupC.h @@ -31,7 +31,7 @@ #include "portablegroup_export.h" #include "tao/PortableServer/PortableServerC.h" -#include "CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" //#include "IOPC.h" #include "tao/GIOPC.h" @@ -73,9 +73,17 @@ TAO_NAMESPACE PortableGroup typedef CORBA::ULong_out ObjectGroupRefVersion_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ObjectGroupRefVersion; + typedef GIOP::Version Version; +// @@ Frank: Version_var and Version_out are commented out as they +// do not exist in tao/GIOPC.h. Hopefully, this doesn't become an +// issue. +// typedef GIOP::Version_var Version_var; +// typedef GIOP::Version_out Version_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Version; + struct TagGroupTaggedComponent; class TagGroupTaggedComponent_var; - + struct TAO_PortableGroup_Export TagGroupTaggedComponent { @@ -85,7 +93,7 @@ TAO_NAMESPACE PortableGroup static void _tao_any_destructor (void*); - GIOP::Version version; + ACE_NESTED_CLASS (PortableGroup, Version) component_version; TAO_String_Manager group_domain_id; ACE_NESTED_CLASS (PortableGroup, ObjectGroupId) object_group_id; ACE_NESTED_CLASS (PortableGroup, ObjectGroupRefVersion) object_group_ref_version; @@ -98,18 +106,18 @@ TAO_NAMESPACE PortableGroup TagGroupTaggedComponent_var (TagGroupTaggedComponent *); TagGroupTaggedComponent_var (const TagGroupTaggedComponent_var &); // copy constructor ~TagGroupTaggedComponent_var (void); // destructor - + TagGroupTaggedComponent_var &operator= (TagGroupTaggedComponent *); TagGroupTaggedComponent_var &operator= (const TagGroupTaggedComponent_var &); TagGroupTaggedComponent *operator-> (void); const TagGroupTaggedComponent *operator-> (void) const; - + operator const TagGroupTaggedComponent &() const; operator TagGroupTaggedComponent &(); operator TagGroupTaggedComponent &() const; operator TagGroupTaggedComponent *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const TagGroupTaggedComponent &in (void) const; TagGroupTaggedComponent &inout (void); TagGroupTaggedComponent *&out (void); @@ -131,7 +139,7 @@ TAO_NAMESPACE PortableGroup operator TagGroupTaggedComponent *&(); TagGroupTaggedComponent *&ptr (void); TagGroupTaggedComponent *operator-> (void); - + private: TagGroupTaggedComponent *&ptr_; // assignment from T_var not allowed @@ -140,8 +148,128 @@ TAO_NAMESPACE PortableGroup TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TagGroupTaggedComponent; - class GenericFactory; +#if !defined (_PORTABLEGROUP_GROUPIIOPPROFILE_CH_) +#define _PORTABLEGROUP_GROUPIIOPPROFILE_CH_ + + class GroupIIOPProfile; + class GroupIIOPProfile_var; + + // ************************************************************* + // GroupIIOPProfile + // ************************************************************* + + class TAO_PortableGroup_Export GroupIIOPProfile : public +#if !defined (TAO_USE_SEQUENCE_TEMPLATES) + TAO_Unbounded_Sequence<CORBA::Octet> +#else /* TAO_USE_SEQUENCE_TEMPLATES */ + TAO_Unbounded_Sequence<CORBA::Octet> +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + { + public: + GroupIIOPProfile (void); // default ctor + GroupIIOPProfile (CORBA::ULong max); // uses max size + GroupIIOPProfile ( + CORBA::ULong max, + CORBA::ULong length, + CORBA::Octet *buffer, + CORBA::Boolean release = 0 + ); + GroupIIOPProfile (const GroupIIOPProfile &); // copy ctor + ~GroupIIOPProfile (void); + static void _tao_any_destructor (void*); + +#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) + typedef GroupIIOPProfile_var _var_type; +#endif /* ! __GNUC__ || g++ >= 2.8 */ + + +#if (TAO_NO_COPY_OCTET_SEQUENCES == 1) + GroupIIOPProfile ( + CORBA::ULong length, + const ACE_Message_Block* mb + ) + : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {} +#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */ + + }; + +#endif /* end #if !defined */ + + +#if !defined (_PORTABLEGROUP_GROUPIIOPPROFILE___VAR_CH_) +#define _PORTABLEGROUP_GROUPIIOPPROFILE___VAR_CH_ + + // ************************************************************* + // class PortableGroup::GroupIIOPProfile_var + // ************************************************************* + + class TAO_PortableGroup_Export GroupIIOPProfile_var + { + public: + GroupIIOPProfile_var (void); // default constructor + GroupIIOPProfile_var (GroupIIOPProfile *); + GroupIIOPProfile_var (const GroupIIOPProfile_var &); // copy constructor + GroupIIOPProfile_var (const GroupIIOPProfile &); // fixed-size base types only + ~GroupIIOPProfile_var (void); // destructor + + GroupIIOPProfile_var &operator= (GroupIIOPProfile *); + GroupIIOPProfile_var &operator= (const GroupIIOPProfile_var &); + GroupIIOPProfile_var &operator= (const GroupIIOPProfile &); // fixed-size base types only + GroupIIOPProfile *operator-> (void); + const GroupIIOPProfile *operator-> (void) const; + + operator const GroupIIOPProfile &() const; + operator GroupIIOPProfile &(); + operator GroupIIOPProfile &() const; + + CORBA::Octet & operator[] (CORBA::ULong index); + const CORBA::Octet & operator[] (CORBA::ULong index) const; + + // in, inout, out, _retn + const GroupIIOPProfile &in (void) const; + GroupIIOPProfile &inout (void); + GroupIIOPProfile *&out (void); + GroupIIOPProfile *_retn (void); + GroupIIOPProfile *ptr (void) const; + + private: + GroupIIOPProfile *ptr_; + }; + + +#endif /* end #if !defined */ + + +#if !defined (_PORTABLEGROUP_GROUPIIOPPROFILE___OUT_CH_) +#define _PORTABLEGROUP_GROUPIIOPPROFILE___OUT_CH_ + + class TAO_PortableGroup_Export GroupIIOPProfile_out + { + public: + GroupIIOPProfile_out (GroupIIOPProfile *&); + GroupIIOPProfile_out (GroupIIOPProfile_var &); + GroupIIOPProfile_out (const GroupIIOPProfile_out &); + GroupIIOPProfile_out &operator= (const GroupIIOPProfile_out &); + GroupIIOPProfile_out &operator= (GroupIIOPProfile *); + operator GroupIIOPProfile *&(); + GroupIIOPProfile *&ptr (void); + GroupIIOPProfile *operator-> (void); + CORBA::Octet & operator[] (CORBA::ULong index); + + private: + GroupIIOPProfile *&ptr_; + // assignment from T_var not allowed + void operator= (const GroupIIOPProfile_var &); + }; + + +#endif /* end #if !defined */ + + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_GroupIIOPProfile; + + class GenericFactory; + #if !defined (_PORTABLEGROUP_GENERICFACTORY___PTR_CH_) #define _PORTABLEGROUP_GENERICFACTORY___PTR_CH_ @@ -157,23 +285,23 @@ TAO_NAMESPACE PortableGroup { public: GenericFactory_var (void); // default constructor - GenericFactory_var (GenericFactory_ptr p) : ptr_ (p) {} + GenericFactory_var (GenericFactory_ptr p) : ptr_ (p) {} GenericFactory_var (const GenericFactory_var &); // copy constructor ~GenericFactory_var (void); // destructor - + GenericFactory_var &operator= (GenericFactory_ptr); GenericFactory_var &operator= (const GenericFactory_var &); GenericFactory_ptr operator-> (void) const; - + operator const GenericFactory_ptr &() const; operator GenericFactory_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn GenericFactory_ptr in (void) const; GenericFactory_ptr &inout (void); GenericFactory_ptr &out (void); GenericFactory_ptr _retn (void); GenericFactory_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static GenericFactory_ptr duplicate (GenericFactory_ptr); @@ -181,7 +309,7 @@ TAO_NAMESPACE PortableGroup static GenericFactory_ptr nil (void); static GenericFactory_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: GenericFactory_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -208,7 +336,7 @@ TAO_NAMESPACE PortableGroup operator GenericFactory_ptr &(); GenericFactory_ptr &ptr (void); GenericFactory_ptr operator-> (void); - + private: GenericFactory_ptr &ptr_; }; @@ -240,7 +368,7 @@ TAO_NAMESPACE PortableGroup struct Property; class Property_var; - + struct TAO_PortableGroup_Export Property { @@ -261,18 +389,18 @@ TAO_NAMESPACE PortableGroup Property_var (Property *); Property_var (const Property_var &); // copy constructor ~Property_var (void); // destructor - + Property_var &operator= (Property *); Property_var &operator= (const Property_var &); Property *operator-> (void); const Property *operator-> (void) const; - + operator const Property &() const; operator Property &(); operator Property &() const; operator Property *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const Property &in (void) const; Property &inout (void); Property *&out (void); @@ -294,7 +422,7 @@ TAO_NAMESPACE PortableGroup operator Property *&(); Property *&ptr (void); Property *operator-> (void); - + private: Property *&ptr_; // assignment from T_var not allowed @@ -305,7 +433,7 @@ TAO_NAMESPACE PortableGroup #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_PROPERTIES_CH_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_PROPERTIES_CH_ @@ -313,9 +441,9 @@ TAO_NAMESPACE PortableGroup { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_PortableGroup_Properties (void); // Default constructor. - _TAO_Unbounded_Sequence_PortableGroup_Properties (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_PortableGroup_Properties (CORBA::ULong maximum); _TAO_Unbounded_Sequence_PortableGroup_Properties (CORBA::ULong maximum, CORBA::ULong length, Property *data, @@ -332,7 +460,7 @@ TAO_NAMESPACE PortableGroup virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + Property *get_buffer (CORBA::Boolean orphan = 0); const Property *get_buffer (void) const; void replace (CORBA::ULong max, @@ -344,32 +472,32 @@ TAO_NAMESPACE PortableGroup #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_PORTABLEGROUP_PROPERTIES_CH_) #define _PORTABLEGROUP_PROPERTIES_CH_ class Properties; class Properties_var; - + // ************************************************************* // Properties // ************************************************************* - - class TAO_PortableGroup_Export Properties : public + + class TAO_PortableGroup_Export Properties : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Properties #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<Property> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: Properties (void); // default ctor Properties (CORBA::ULong max); // uses max size Properties ( - CORBA::ULong max, - CORBA::ULong length, - Property *buffer, + CORBA::ULong max, + CORBA::ULong length, + Property *buffer, CORBA::Boolean release = 0 ); Properties (const Properties &); // copy ctor @@ -381,7 +509,7 @@ TAO_NAMESPACE PortableGroup #endif /* ! __GNUC__ || g++ >= 2.8 */ }; - + #endif /* end #if !defined */ @@ -399,21 +527,21 @@ TAO_NAMESPACE PortableGroup Properties_var (Properties *); Properties_var (const Properties_var &); // copy constructor ~Properties_var (void); // destructor - + Properties_var &operator= (Properties *); Properties_var &operator= (const Properties_var &); Properties *operator-> (void); const Properties *operator-> (void) const; - + operator const Properties &() const; operator Properties &(); operator Properties &() const; operator Properties *&(); // variable-size base types only - + Property & operator[] (CORBA::ULong index); const Property & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const Properties &in (void) const; Properties &inout (void); Properties *&out (void); @@ -443,7 +571,7 @@ TAO_NAMESPACE PortableGroup Properties *&ptr (void); Properties *operator-> (void); Property & operator[] (CORBA::ULong index); - + private: Properties *&ptr_; // assignment from T_var not allowed @@ -462,7 +590,7 @@ TAO_NAMESPACE PortableGroup #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_LOCATIONS_CH_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_LOCATIONS_CH_ @@ -470,9 +598,9 @@ TAO_NAMESPACE PortableGroup { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_PortableGroup_Locations (void); // Default constructor. - _TAO_Unbounded_Sequence_PortableGroup_Locations (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_PortableGroup_Locations (CORBA::ULong maximum); _TAO_Unbounded_Sequence_PortableGroup_Locations (CORBA::ULong maximum, CORBA::ULong length, Location *data, @@ -489,7 +617,7 @@ TAO_NAMESPACE PortableGroup virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + Location *get_buffer (CORBA::Boolean orphan = 0); const Location *get_buffer (void) const; void replace (CORBA::ULong max, @@ -501,32 +629,32 @@ TAO_NAMESPACE PortableGroup #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_PORTABLEGROUP_LOCATIONS_CH_) #define _PORTABLEGROUP_LOCATIONS_CH_ class Locations; class Locations_var; - + // ************************************************************* // Locations // ************************************************************* - - class TAO_PortableGroup_Export Locations : public + + class TAO_PortableGroup_Export Locations : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_Locations #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<Location> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: Locations (void); // default ctor Locations (CORBA::ULong max); // uses max size Locations ( - CORBA::ULong max, - CORBA::ULong length, - Location *buffer, + CORBA::ULong max, + CORBA::ULong length, + Location *buffer, CORBA::Boolean release = 0 ); Locations (const Locations &); // copy ctor @@ -538,7 +666,7 @@ TAO_NAMESPACE PortableGroup #endif /* ! __GNUC__ || g++ >= 2.8 */ }; - + #endif /* end #if !defined */ @@ -556,21 +684,21 @@ TAO_NAMESPACE PortableGroup Locations_var (Locations *); Locations_var (const Locations_var &); // copy constructor ~Locations_var (void); // destructor - + Locations_var &operator= (Locations *); Locations_var &operator= (const Locations_var &); Locations *operator-> (void); const Locations *operator-> (void) const; - + operator const Locations &() const; operator Locations &(); operator Locations &() const; operator Locations *&(); // variable-size base types only - + Location & operator[] (CORBA::ULong index); const Location & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const Locations &in (void) const; Locations &inout (void); Locations *&out (void); @@ -600,7 +728,7 @@ TAO_NAMESPACE PortableGroup Locations *&ptr (void); Locations *operator-> (void); Location & operator[] (CORBA::ULong index); - + private: Locations *&ptr_; // assignment from T_var not allowed @@ -619,7 +747,7 @@ TAO_NAMESPACE PortableGroup struct FactoryInfo; class FactoryInfo_var; - + struct TAO_PortableGroup_Export FactoryInfo { @@ -639,18 +767,18 @@ TAO_NAMESPACE PortableGroup FactoryInfo_var (FactoryInfo *); FactoryInfo_var (const FactoryInfo_var &); // copy constructor ~FactoryInfo_var (void); // destructor - + FactoryInfo_var &operator= (FactoryInfo *); FactoryInfo_var &operator= (const FactoryInfo_var &); FactoryInfo *operator-> (void); const FactoryInfo *operator-> (void) const; - + operator const FactoryInfo &() const; operator FactoryInfo &(); operator FactoryInfo &() const; operator FactoryInfo *&(); // variable-size types only - - // in, inout, out, _retn + + // in, inout, out, _retn const FactoryInfo &in (void) const; FactoryInfo &inout (void); FactoryInfo *&out (void); @@ -672,7 +800,7 @@ TAO_NAMESPACE PortableGroup operator FactoryInfo *&(); FactoryInfo *&ptr (void); FactoryInfo *operator-> (void); - + private: FactoryInfo *&ptr_; // assignment from T_var not allowed @@ -681,7 +809,7 @@ TAO_NAMESPACE PortableGroup #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_FACTORYINFOS_CH_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_FACTORYINFOS_CH_ @@ -689,9 +817,9 @@ TAO_NAMESPACE PortableGroup { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (void); // Default constructor. - _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (CORBA::ULong maximum); + _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (CORBA::ULong maximum); _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (CORBA::ULong maximum, CORBA::ULong length, FactoryInfo *data, @@ -708,7 +836,7 @@ TAO_NAMESPACE PortableGroup virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + FactoryInfo *get_buffer (CORBA::Boolean orphan = 0); const FactoryInfo *get_buffer (void) const; void replace (CORBA::ULong max, @@ -720,32 +848,32 @@ TAO_NAMESPACE PortableGroup #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ + #if !defined (_PORTABLEGROUP_FACTORYINFOS_CH_) #define _PORTABLEGROUP_FACTORYINFOS_CH_ class FactoryInfos; class FactoryInfos_var; - + // ************************************************************* // FactoryInfos // ************************************************************* - - class TAO_PortableGroup_Export FactoryInfos : public + + class TAO_PortableGroup_Export FactoryInfos : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos #else /* TAO_USE_SEQUENCE_TEMPLATES */ TAO_Unbounded_Sequence<FactoryInfo> -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ { public: FactoryInfos (void); // default ctor FactoryInfos (CORBA::ULong max); // uses max size FactoryInfos ( - CORBA::ULong max, - CORBA::ULong length, - FactoryInfo *buffer, + CORBA::ULong max, + CORBA::ULong length, + FactoryInfo *buffer, CORBA::Boolean release = 0 ); FactoryInfos (const FactoryInfos &); // copy ctor @@ -757,7 +885,7 @@ TAO_NAMESPACE PortableGroup #endif /* ! __GNUC__ || g++ >= 2.8 */ }; - + #endif /* end #if !defined */ @@ -775,21 +903,21 @@ TAO_NAMESPACE PortableGroup FactoryInfos_var (FactoryInfos *); FactoryInfos_var (const FactoryInfos_var &); // copy constructor ~FactoryInfos_var (void); // destructor - + FactoryInfos_var &operator= (FactoryInfos *); FactoryInfos_var &operator= (const FactoryInfos_var &); FactoryInfos *operator-> (void); const FactoryInfos *operator-> (void) const; - + operator const FactoryInfos &() const; operator FactoryInfos &(); operator FactoryInfos &() const; operator FactoryInfos *&(); // variable-size base types only - + FactoryInfo & operator[] (CORBA::ULong index); const FactoryInfo & operator[] (CORBA::ULong index) const; - - // in, inout, out, _retn + + // in, inout, out, _retn const FactoryInfos &in (void) const; FactoryInfos &inout (void); FactoryInfos *&out (void); @@ -819,7 +947,7 @@ TAO_NAMESPACE PortableGroup FactoryInfos *&ptr (void); FactoryInfos *operator-> (void); FactoryInfo & operator[] (CORBA::ULong index); - + private: FactoryInfos *&ptr_; // assignment from T_var not allowed @@ -855,29 +983,29 @@ TAO_NAMESPACE PortableGroup InterfaceNotFound (void); // Default constructor. - + InterfaceNotFound (const InterfaceNotFound &); // Copy constructor. - + ~InterfaceNotFound (void); // Destructor. - + static void _tao_any_destructor (void*); - + InterfaceNotFound &operator= (const InterfaceNotFound &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static InterfaceNotFound *_downcast (CORBA::Exception *); @@ -901,29 +1029,29 @@ TAO_NAMESPACE PortableGroup ObjectGroupNotFound (void); // Default constructor. - + ObjectGroupNotFound (const ObjectGroupNotFound &); // Copy constructor. - + ~ObjectGroupNotFound (void); // Destructor. - + static void _tao_any_destructor (void*); - + ObjectGroupNotFound &operator= (const ObjectGroupNotFound &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ObjectGroupNotFound *_downcast (CORBA::Exception *); @@ -947,29 +1075,29 @@ TAO_NAMESPACE PortableGroup MemberNotFound (void); // Default constructor. - + MemberNotFound (const MemberNotFound &); // Copy constructor. - + ~MemberNotFound (void); // Destructor. - + static void _tao_any_destructor (void*); - + MemberNotFound &operator= (const MemberNotFound &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static MemberNotFound *_downcast (CORBA::Exception *); @@ -993,29 +1121,29 @@ TAO_NAMESPACE PortableGroup ObjectNotFound (void); // Default constructor. - + ObjectNotFound (const ObjectNotFound &); // Copy constructor. - + ~ObjectNotFound (void); // Destructor. - + static void _tao_any_destructor (void*); - + ObjectNotFound &operator= (const ObjectNotFound &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ObjectNotFound *_downcast (CORBA::Exception *); @@ -1039,29 +1167,29 @@ TAO_NAMESPACE PortableGroup MemberAlreadyPresent (void); // Default constructor. - + MemberAlreadyPresent (const MemberAlreadyPresent &); // Copy constructor. - + ~MemberAlreadyPresent (void); // Destructor. - + static void _tao_any_destructor (void*); - + MemberAlreadyPresent &operator= (const MemberAlreadyPresent &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static MemberAlreadyPresent *_downcast (CORBA::Exception *); @@ -1085,29 +1213,29 @@ TAO_NAMESPACE PortableGroup BadReplicationStyle (void); // Default constructor. - + BadReplicationStyle (const BadReplicationStyle &); // Copy constructor. - + ~BadReplicationStyle (void); // Destructor. - + static void _tao_any_destructor (void*); - + BadReplicationStyle &operator= (const BadReplicationStyle &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static BadReplicationStyle *_downcast (CORBA::Exception *); @@ -1131,29 +1259,29 @@ TAO_NAMESPACE PortableGroup ObjectNotCreated (void); // Default constructor. - + ObjectNotCreated (const ObjectNotCreated &); // Copy constructor. - + ~ObjectNotCreated (void); // Destructor. - + static void _tao_any_destructor (void*); - + ObjectNotCreated &operator= (const ObjectNotCreated &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ObjectNotCreated *_downcast (CORBA::Exception *); @@ -1177,29 +1305,29 @@ TAO_NAMESPACE PortableGroup ObjectNotAdded (void); // Default constructor. - + ObjectNotAdded (const ObjectNotAdded &); // Copy constructor. - + ~ObjectNotAdded (void); // Destructor. - + static void _tao_any_destructor (void*); - + ObjectNotAdded &operator= (const ObjectNotAdded &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static ObjectNotAdded *_downcast (CORBA::Exception *); @@ -1224,35 +1352,35 @@ TAO_NAMESPACE PortableGroup UnsupportedProperty (void); // Default constructor. - + UnsupportedProperty (const UnsupportedProperty &); // Copy constructor. - + ~UnsupportedProperty (void); // Destructor. - + static void _tao_any_destructor (void*); - + UnsupportedProperty &operator= (const UnsupportedProperty &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static UnsupportedProperty *_downcast (CORBA::Exception *); UnsupportedProperty ( const ACE_NESTED_CLASS (PortableGroup, Name) & _tao_nam ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; @@ -1275,36 +1403,36 @@ TAO_NAMESPACE PortableGroup InvalidProperty (void); // Default constructor. - + InvalidProperty (const InvalidProperty &); // Copy constructor. - + ~InvalidProperty (void); // Destructor. - + static void _tao_any_destructor (void*); - + InvalidProperty &operator= (const InvalidProperty &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static InvalidProperty *_downcast (CORBA::Exception *); InvalidProperty ( const ACE_NESTED_CLASS (PortableGroup, Name) & _tao_nam, const ACE_NESTED_CLASS (PortableGroup, Value) & _tao_val ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; @@ -1327,36 +1455,36 @@ TAO_NAMESPACE PortableGroup NoFactory (void); // Default constructor. - + NoFactory (const NoFactory &); // Copy constructor. - + ~NoFactory (void); // Destructor. - + static void _tao_any_destructor (void*); - + NoFactory &operator= (const NoFactory &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static NoFactory *_downcast (CORBA::Exception *); NoFactory ( const ACE_NESTED_CLASS (PortableGroup, Location) & _tao_the_location, const char * _tao_type_id ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; @@ -1378,35 +1506,35 @@ TAO_NAMESPACE PortableGroup InvalidCriteria (void); // Default constructor. - + InvalidCriteria (const InvalidCriteria &); // Copy constructor. - + ~InvalidCriteria (void); // Destructor. - + static void _tao_any_destructor (void*); - + InvalidCriteria &operator= (const InvalidCriteria &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static InvalidCriteria *_downcast (CORBA::Exception *); InvalidCriteria ( const ACE_NESTED_CLASS (PortableGroup, Criteria) & _tao_invalid_criteria ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; @@ -1428,35 +1556,35 @@ TAO_NAMESPACE PortableGroup CannotMeetCriteria (void); // Default constructor. - + CannotMeetCriteria (const CannotMeetCriteria &); // Copy constructor. - + ~CannotMeetCriteria (void); // Destructor. - + static void _tao_any_destructor (void*); - + CannotMeetCriteria &operator= (const CannotMeetCriteria &); - + virtual void _raise (void); virtual void _tao_encode ( TAO_OutputCDR &, CORBA::Environment & ) const; - + virtual void _tao_decode ( TAO_InputCDR &, CORBA::Environment & ); - + static CannotMeetCriteria *_downcast (CORBA::Exception *); CannotMeetCriteria ( const ACE_NESTED_CLASS (PortableGroup, Criteria) & _tao_unmet_criteria ); - + // = TAO extension. static CORBA::Exception *_alloc (void); virtual CORBA::TypeCode_ptr _type (void) const; @@ -1473,7 +1601,7 @@ TAO_NAMESPACE PortableGroup class PropertyManager; typedef PropertyManager *PropertyManager_ptr; - + #endif /* end #if !defined */ @@ -1484,23 +1612,23 @@ TAO_NAMESPACE PortableGroup { public: PropertyManager_var (void); // default constructor - PropertyManager_var (PropertyManager_ptr p) : ptr_ (p) {} + PropertyManager_var (PropertyManager_ptr p) : ptr_ (p) {} PropertyManager_var (const PropertyManager_var &); // copy constructor ~PropertyManager_var (void); // destructor - + PropertyManager_var &operator= (PropertyManager_ptr); PropertyManager_var &operator= (const PropertyManager_var &); PropertyManager_ptr operator-> (void) const; - + operator const PropertyManager_ptr &() const; operator PropertyManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn PropertyManager_ptr in (void) const; PropertyManager_ptr &inout (void); PropertyManager_ptr &out (void); PropertyManager_ptr _retn (void); PropertyManager_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static PropertyManager_ptr duplicate (PropertyManager_ptr); @@ -1508,7 +1636,7 @@ TAO_NAMESPACE PortableGroup static PropertyManager_ptr nil (void); static PropertyManager_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: PropertyManager_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1535,7 +1663,7 @@ TAO_NAMESPACE PortableGroup operator PropertyManager_ptr &(); PropertyManager_ptr &ptr (void); PropertyManager_ptr operator-> (void); - + private: PropertyManager_ptr &ptr_; }; @@ -1559,12 +1687,12 @@ TAO_NAMESPACE PortableGroup static PropertyManager_ptr _duplicate (PropertyManager_ptr obj); static PropertyManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static PropertyManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static PropertyManager_ptr _nil (void) @@ -1574,7 +1702,7 @@ TAO_NAMESPACE PortableGroup virtual void set_default_properties ( const PortableGroup::Properties & props, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1584,7 +1712,7 @@ TAO_NAMESPACE PortableGroup )) = 0; virtual PortableGroup::Properties * get_default_properties ( - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1593,7 +1721,7 @@ TAO_NAMESPACE PortableGroup virtual void remove_default_properties ( const PortableGroup::Properties & props, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1605,7 +1733,7 @@ TAO_NAMESPACE PortableGroup virtual void set_type_properties ( const char * type_id, const PortableGroup::Properties & overrides, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1616,7 +1744,7 @@ TAO_NAMESPACE PortableGroup virtual PortableGroup::Properties * get_type_properties ( const char * type_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1626,7 +1754,7 @@ TAO_NAMESPACE PortableGroup virtual void remove_type_properties ( const char * type_id, const PortableGroup::Properties & props, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1638,7 +1766,7 @@ TAO_NAMESPACE PortableGroup virtual void set_properties_dynamically ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Properties & overrides, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1650,7 +1778,7 @@ TAO_NAMESPACE PortableGroup virtual PortableGroup::Properties * get_properties ( PortableGroup::ObjectGroup_ptr object_group, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1659,12 +1787,12 @@ TAO_NAMESPACE PortableGroup )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: PropertyManager (); - + virtual ~PropertyManager (void); private: PropertyManager (const PropertyManager &); @@ -1680,7 +1808,7 @@ TAO_NAMESPACE PortableGroup class ObjectGroupManager; typedef ObjectGroupManager *ObjectGroupManager_ptr; - + #endif /* end #if !defined */ @@ -1691,23 +1819,23 @@ TAO_NAMESPACE PortableGroup { public: ObjectGroupManager_var (void); // default constructor - ObjectGroupManager_var (ObjectGroupManager_ptr p) : ptr_ (p) {} + ObjectGroupManager_var (ObjectGroupManager_ptr p) : ptr_ (p) {} ObjectGroupManager_var (const ObjectGroupManager_var &); // copy constructor ~ObjectGroupManager_var (void); // destructor - + ObjectGroupManager_var &operator= (ObjectGroupManager_ptr); ObjectGroupManager_var &operator= (const ObjectGroupManager_var &); ObjectGroupManager_ptr operator-> (void) const; - + operator const ObjectGroupManager_ptr &() const; operator ObjectGroupManager_ptr &(); - // in, inout, out, _retn + // in, inout, out, _retn ObjectGroupManager_ptr in (void) const; ObjectGroupManager_ptr &inout (void); ObjectGroupManager_ptr &out (void); ObjectGroupManager_ptr _retn (void); ObjectGroupManager_ptr ptr (void) const; - + // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. static ObjectGroupManager_ptr duplicate (ObjectGroupManager_ptr); @@ -1715,7 +1843,7 @@ TAO_NAMESPACE PortableGroup static ObjectGroupManager_ptr nil (void); static ObjectGroupManager_ptr narrow (CORBA::Object *, CORBA::Environment &); static CORBA::Object * upcast (void *); - + private: ObjectGroupManager_ptr ptr_; // Unimplemented - prevents widening assignment. @@ -1742,7 +1870,7 @@ TAO_NAMESPACE PortableGroup operator ObjectGroupManager_ptr &(); ObjectGroupManager_ptr &ptr (void); ObjectGroupManager_ptr operator-> (void); - + private: ObjectGroupManager_ptr &ptr_; }; @@ -1766,12 +1894,12 @@ TAO_NAMESPACE PortableGroup static ObjectGroupManager_ptr _duplicate (ObjectGroupManager_ptr obj); static ObjectGroupManager_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ObjectGroupManager_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static ObjectGroupManager_ptr _nil (void) @@ -1784,7 +1912,7 @@ TAO_NAMESPACE PortableGroup const PortableGroup::Location & the_location, const char * type_id, const PortableGroup::Criteria & the_criteria, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1801,7 +1929,7 @@ TAO_NAMESPACE PortableGroup PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, CORBA::Object_ptr member, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1814,7 +1942,7 @@ TAO_NAMESPACE PortableGroup virtual PortableGroup::ObjectGroup_ptr remove_member ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & the_location, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1825,7 +1953,7 @@ TAO_NAMESPACE PortableGroup virtual PortableGroup::Locations * locations_of_members ( PortableGroup::ObjectGroup_ptr object_group, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1835,7 +1963,7 @@ TAO_NAMESPACE PortableGroup virtual PortableGroup::ObjectGroupId get_object_group_id ( PortableGroup::ObjectGroup_ptr object_group, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1845,7 +1973,7 @@ TAO_NAMESPACE PortableGroup virtual PortableGroup::ObjectGroup_ptr get_object_group_ref ( PortableGroup::ObjectGroup_ptr object_group, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1856,7 +1984,7 @@ TAO_NAMESPACE PortableGroup virtual CORBA::Object_ptr get_member_ref ( PortableGroup::ObjectGroup_ptr object_group, const PortableGroup::Location & loc, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1866,12 +1994,12 @@ TAO_NAMESPACE PortableGroup )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: ObjectGroupManager (); - + virtual ~ObjectGroupManager (void); private: ObjectGroupManager (const ObjectGroupManager &); @@ -1897,12 +2025,12 @@ TAO_NAMESPACE PortableGroup static GenericFactory_ptr _duplicate (GenericFactory_ptr obj); static GenericFactory_ptr _narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static GenericFactory_ptr _unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); static GenericFactory_ptr _nil (void) @@ -1918,7 +2046,7 @@ TAO_NAMESPACE PortableGroup const char * type_id, const PortableGroup::Criteria & the_criteria, PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1932,7 +2060,7 @@ TAO_NAMESPACE PortableGroup virtual void delete_object ( const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ) ACE_THROW_SPEC (( @@ -1941,12 +2069,12 @@ TAO_NAMESPACE PortableGroup )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); - + virtual const char* _interface_repository_id (void) const; protected: GenericFactory (); - + virtual ~GenericFactory (void); private: GenericFactory (const GenericFactory &); @@ -1964,6 +2092,10 @@ TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const PortableGroup::Ta TAO_PortableGroup_Export void operator<<= (CORBA::Any &, PortableGroup::TagGroupTaggedComponent*); // noncopying version TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableGroup::TagGroupTaggedComponent *&); // deprecated TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableGroup::TagGroupTaggedComponent *&); +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const PortableGroup::GroupIIOPProfile &); // copying version +TAO_PortableGroup_Export void operator<<= (CORBA::Any &, PortableGroup::GroupIIOPProfile*); // noncopying version +TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableGroup::GroupIIOPProfile *&); // deprecated +TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableGroup::GroupIIOPProfile *&); TAO_PortableGroup_Export void operator<<= (CORBA::Any &, const PortableGroup::Property &); // copying version TAO_PortableGroup_Export void operator<<= (CORBA::Any &, PortableGroup::Property*); // noncopying version TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableGroup::Property *&); // deprecated @@ -2033,6 +2165,21 @@ TAO_PortableGroup_Export CORBA::Boolean operator>>= (const CORBA::Any &, const P TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableGroup::TagGroupTaggedComponent &); TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableGroup::TagGroupTaggedComponent &); + +#if !defined _TAO_CDR_OP_PortableGroup_GroupIIOPProfile_H_ +#define _TAO_CDR_OP_PortableGroup_GroupIIOPProfile_H_ + +TAO_PortableGroup_Export CORBA::Boolean operator<< ( + TAO_OutputCDR &, + const PortableGroup::GroupIIOPProfile & + ); +TAO_PortableGroup_Export CORBA::Boolean operator>> ( + TAO_InputCDR &, + PortableGroup::GroupIIOPProfile & + ); + +#endif /* _TAO_CDR_OP_PortableGroup_GroupIIOPProfile_H_ */ + TAO_PortableGroup_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableGroup::Property &); TAO_PortableGroup_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableGroup::Property &); diff --git a/TAO/tao/PortableGroup/PortableGroupC.i b/TAO/tao/PortableGroup/PortableGroupC.i index 47392e541b0..62d0731f31e 100644 --- a/TAO/tao/PortableGroup/PortableGroupC.i +++ b/TAO/tao/PortableGroup/PortableGroupC.i @@ -70,7 +70,7 @@ PortableGroup::TagGroupTaggedComponent_var::operator= (const ::PortableGroup::Ta { TagGroupTaggedComponent *deep_copy = new TagGroupTaggedComponent (*p.ptr_); - + if (deep_copy != 0) { TagGroupTaggedComponent *tmp = deep_copy; @@ -80,7 +80,7 @@ PortableGroup::TagGroupTaggedComponent_var::operator= (const ::PortableGroup::Ta } } } - + return *this; } @@ -103,20 +103,20 @@ PortableGroup::TagGroupTaggedComponent_var::operator const ::PortableGroup::TagG } ACE_INLINE -PortableGroup::TagGroupTaggedComponent_var::operator ::PortableGroup::TagGroupTaggedComponent &() // cast +PortableGroup::TagGroupTaggedComponent_var::operator ::PortableGroup::TagGroupTaggedComponent &() // cast { return *this->ptr_; } ACE_INLINE -PortableGroup::TagGroupTaggedComponent_var::operator ::PortableGroup::TagGroupTaggedComponent &() const // cast +PortableGroup::TagGroupTaggedComponent_var::operator ::PortableGroup::TagGroupTaggedComponent &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableGroup::TagGroupTaggedComponent_var::operator ::PortableGroup::TagGroupTaggedComponent *&() // cast +PortableGroup::TagGroupTaggedComponent_var::operator ::PortableGroup::TagGroupTaggedComponent *&() // cast { return this->ptr_; } @@ -133,7 +133,7 @@ PortableGroup::TagGroupTaggedComponent_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableGroup::TagGroupTaggedComponent *& PortableGroup::TagGroupTaggedComponent_var::out (void) { @@ -194,7 +194,7 @@ PortableGroup::TagGroupTaggedComponent_out::operator= (TagGroupTaggedComponent * return *this; } -ACE_INLINE +ACE_INLINE PortableGroup::TagGroupTaggedComponent_out::operator ::PortableGroup::TagGroupTaggedComponent *&() // cast { return this->ptr_; @@ -212,6 +212,236 @@ PortableGroup::TagGroupTaggedComponent_out::operator-> (void) return this->ptr_; } + +#if !defined (_PORTABLEGROUP_GROUPIIOPPROFILE_CI_) +#define _PORTABLEGROUP_GROUPIIOPPROFILE_CI_ + +// ************************************************************* +// Inline operations for class PortableGroup::GroupIIOPProfile_var +// ************************************************************* + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::GroupIIOPProfile_var (void) // default constructor + : ptr_ (0) +{} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::GroupIIOPProfile_var (GroupIIOPProfile *p) + : ptr_ (p) +{} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::GroupIIOPProfile_var (const ::PortableGroup::GroupIIOPProfile_var &p) // copy constructor +{ + if (p.ptr_) + ACE_NEW (this->ptr_, ::PortableGroup::GroupIIOPProfile (*p.ptr_)); + else + this->ptr_ = 0; +} + +// fixed-size base types only +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::GroupIIOPProfile_var (const ::PortableGroup::GroupIIOPProfile &p) +{ + ACE_NEW (this->ptr_, ::PortableGroup::GroupIIOPProfile (p)); +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::~GroupIIOPProfile_var (void) // destructor +{ + delete this->ptr_; +} + +ACE_INLINE PortableGroup::GroupIIOPProfile_var & +PortableGroup::GroupIIOPProfile_var::operator= (GroupIIOPProfile *p) +{ + delete this->ptr_; + this->ptr_ = p; + return *this; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile_var & +PortableGroup::GroupIIOPProfile_var::operator= (const ::PortableGroup::GroupIIOPProfile_var &p) +{ + if (this != &p) + { + if (p.ptr_ == 0) + { + delete this->ptr_; + this->ptr_ = 0; + } + else + { + GroupIIOPProfile *deep_copy = + new GroupIIOPProfile (*p.ptr_); + + if (deep_copy != 0) + { + GroupIIOPProfile *tmp = deep_copy; + deep_copy = this->ptr_; + this->ptr_ = tmp; + delete deep_copy; + } + } + } + + return *this; +} + +// fixed-size types only +ACE_INLINE ::PortableGroup::GroupIIOPProfile_var & +PortableGroup::GroupIIOPProfile_var::operator= (const ::PortableGroup::GroupIIOPProfile &p) +{ + if (this->ptr_ != &p) + { + delete this->ptr_; + ACE_NEW_RETURN (this->ptr_, ::PortableGroup::GroupIIOPProfile (p), *this); + } + return *this; +} + +ACE_INLINE const ::PortableGroup::GroupIIOPProfile * +PortableGroup::GroupIIOPProfile_var::operator-> (void) const +{ + return this->ptr_; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile * +PortableGroup::GroupIIOPProfile_var::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::operator const ::PortableGroup::GroupIIOPProfile &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::operator ::PortableGroup::GroupIIOPProfile &() // cast +{ + return *this->ptr_; +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_var::operator ::PortableGroup::GroupIIOPProfile &() const // cast +{ + return *this->ptr_; +} + +ACE_INLINE CORBA::Octet & +PortableGroup::GroupIIOPProfile_var::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + +ACE_INLINE const CORBA::Octet & +PortableGroup::GroupIIOPProfile_var::operator[] (CORBA::ULong index) const +{ + return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index)); +} + +ACE_INLINE const ::PortableGroup::GroupIIOPProfile & +PortableGroup::GroupIIOPProfile_var::in (void) const +{ + return *this->ptr_; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile & +PortableGroup::GroupIIOPProfile_var::inout (void) +{ + return *this->ptr_; +} + +// mapping for variable size +ACE_INLINE ::PortableGroup::GroupIIOPProfile *& +PortableGroup::GroupIIOPProfile_var::out (void) +{ + delete this->ptr_; + this->ptr_ = 0; + return this->ptr_; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile * +PortableGroup::GroupIIOPProfile_var::_retn (void) +{ + ::PortableGroup::GroupIIOPProfile *tmp = this->ptr_; + this->ptr_ = 0; + return tmp; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile * +PortableGroup::GroupIIOPProfile_var::ptr (void) const +{ + return this->ptr_; +} + +// ************************************************************* +// Inline operations for class PortableGroup::GroupIIOPProfile_out +// ************************************************************* + +ACE_INLINE +PortableGroup::GroupIIOPProfile_out::GroupIIOPProfile_out (GroupIIOPProfile *&p) + : ptr_ (p) +{ + this->ptr_ = 0; +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_out::GroupIIOPProfile_out (GroupIIOPProfile_var &p) // constructor from _var + : ptr_ (p.out ()) +{ + delete this->ptr_; + this->ptr_ = 0; +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_out::GroupIIOPProfile_out (const ::PortableGroup::GroupIIOPProfile_out &p) // copy constructor + : ptr_ (ACE_const_cast (GroupIIOPProfile_out&, p).ptr_) +{} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile_out & +PortableGroup::GroupIIOPProfile_out::operator= (const ::PortableGroup::GroupIIOPProfile_out &p) +{ + this->ptr_ = ACE_const_cast (GroupIIOPProfile_out&, p).ptr_; + return *this; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile_out & +PortableGroup::GroupIIOPProfile_out::operator= (GroupIIOPProfile *p) +{ + this->ptr_ = p; + return *this; +} + +ACE_INLINE +PortableGroup::GroupIIOPProfile_out::operator ::PortableGroup::GroupIIOPProfile *&() // cast +{ + return this->ptr_; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile *& +PortableGroup::GroupIIOPProfile_out::ptr (void) // ptr +{ + return this->ptr_; +} + +ACE_INLINE ::PortableGroup::GroupIIOPProfile * +PortableGroup::GroupIIOPProfile_out::operator-> (void) +{ + return this->ptr_; +} + +ACE_INLINE CORBA::Octet & +PortableGroup::GroupIIOPProfile_out::operator[] (CORBA::ULong index) +{ + return this->ptr_->operator[] (index); +} + + +#endif /* end #if !defined */ + // ************************************************************* // Inline operations for class PortableGroup::Property_var // ************************************************************* @@ -263,7 +493,7 @@ PortableGroup::Property_var::operator= (const ::PortableGroup::Property_var &p) { Property *deep_copy = new Property (*p.ptr_); - + if (deep_copy != 0) { Property *tmp = deep_copy; @@ -273,7 +503,7 @@ PortableGroup::Property_var::operator= (const ::PortableGroup::Property_var &p) } } } - + return *this; } @@ -296,20 +526,20 @@ PortableGroup::Property_var::operator const ::PortableGroup::Property &() const } ACE_INLINE -PortableGroup::Property_var::operator ::PortableGroup::Property &() // cast +PortableGroup::Property_var::operator ::PortableGroup::Property &() // cast { return *this->ptr_; } ACE_INLINE -PortableGroup::Property_var::operator ::PortableGroup::Property &() const // cast +PortableGroup::Property_var::operator ::PortableGroup::Property &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableGroup::Property_var::operator ::PortableGroup::Property *&() // cast +PortableGroup::Property_var::operator ::PortableGroup::Property *&() // cast { return this->ptr_; } @@ -326,7 +556,7 @@ PortableGroup::Property_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableGroup::Property *& PortableGroup::Property_var::out (void) { @@ -387,7 +617,7 @@ PortableGroup::Property_out::operator= (Property *p) return *this; } -ACE_INLINE +ACE_INLINE PortableGroup::Property_out::operator ::PortableGroup::Property *&() // cast { return this->ptr_; @@ -407,7 +637,7 @@ PortableGroup::Property_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_PROPERTIES_CI_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_PROPERTIES_CI_ @@ -420,24 +650,24 @@ PortableGroup::Property_out::operator-> (void) ACE_NEW_RETURN (retval, PortableGroup::Property[size], 0); return retval; } - + ACE_INLINE void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::freebuf (PortableGroup::Property *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::_TAO_Unbounded_Sequence_PortableGroup_Properties (void) // Default constructor. { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::_TAO_Unbounded_Sequence_PortableGroup_Properties (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableGroup_Properties::allocbuf (maximum)) { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::_TAO_Unbounded_Sequence_PortableGroup_Properties (CORBA::ULong maximum, CORBA::ULong length, @@ -446,7 +676,7 @@ PortableGroup::Property_out::operator-> (void) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::_TAO_Unbounded_Sequence_PortableGroup_Properties (const _TAO_Unbounded_Sequence_PortableGroup_Properties &rhs) // Copy constructor. @@ -456,10 +686,10 @@ PortableGroup::Property_out::operator-> (void) { PortableGroup::Property *tmp1 = _TAO_Unbounded_Sequence_PortableGroup_Properties::allocbuf (this->maximum_); PortableGroup::Property * const tmp2 = ACE_reinterpret_cast (PortableGroup::Property * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -467,14 +697,14 @@ PortableGroup::Property_out::operator-> (void) this->buffer_ = 0; } } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::operator= (const _TAO_Unbounded_Sequence_PortableGroup_Properties &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -487,18 +717,18 @@ PortableGroup::Property_out::operator-> (void) } else this->buffer_ = _TAO_Unbounded_Sequence_PortableGroup_Properties::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + PortableGroup::Property *tmp1 = ACE_reinterpret_cast (PortableGroup::Property *, this->buffer_); PortableGroup::Property * const tmp2 = ACE_reinterpret_cast (PortableGroup::Property * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE PortableGroup::Property & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::operator[] (CORBA::ULong i) @@ -508,7 +738,7 @@ PortableGroup::Property_out::operator-> (void) PortableGroup::Property* tmp = ACE_reinterpret_cast(PortableGroup::Property*,this->buffer_); return tmp[i]; } - + ACE_INLINE const PortableGroup::Property & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::operator[] (CORBA::ULong i) const // operator [] @@ -517,9 +747,9 @@ PortableGroup::Property_out::operator-> (void) PortableGroup::Property * const tmp = ACE_reinterpret_cast (PortableGroup::Property* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ACE_INLINE PortableGroup::Property * PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::get_buffer (CORBA::Boolean orphan) { @@ -553,13 +783,13 @@ PortableGroup::Property_out::operator-> (void) } return result; } - + ACE_INLINE const PortableGroup::Property * PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::get_buffer (void) const { return ACE_reinterpret_cast(const PortableGroup::Property * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Properties::replace (CORBA::ULong max, CORBA::ULong length, @@ -576,11 +806,11 @@ PortableGroup::Property_out::operator-> (void) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEGROUP_PROPERTIES_CI_) #define _PORTABLEGROUP_PROPERTIES_CI_ @@ -636,7 +866,7 @@ PortableGroup::Properties_var::operator= (const ::PortableGroup::Properties_var { Properties *deep_copy = new Properties (*p.ptr_); - + if (deep_copy != 0) { Properties *tmp = deep_copy; @@ -646,7 +876,7 @@ PortableGroup::Properties_var::operator= (const ::PortableGroup::Properties_var } } } - + return *this; } @@ -662,27 +892,27 @@ PortableGroup::Properties_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE PortableGroup::Properties_var::operator const ::PortableGroup::Properties &() const // cast { return *this->ptr_; } -ACE_INLINE -PortableGroup::Properties_var::operator ::PortableGroup::Properties &() // cast +ACE_INLINE +PortableGroup::Properties_var::operator ::PortableGroup::Properties &() // cast { return *this->ptr_; } -ACE_INLINE -PortableGroup::Properties_var::operator ::PortableGroup::Properties &() const // cast +ACE_INLINE +PortableGroup::Properties_var::operator ::PortableGroup::Properties &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableGroup::Properties_var::operator ::PortableGroup::Properties *&() // cast +PortableGroup::Properties_var::operator ::PortableGroup::Properties *&() // cast { return this->ptr_; } @@ -711,7 +941,7 @@ PortableGroup::Properties_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableGroup::Properties *& PortableGroup::Properties_var::out (void) { @@ -772,7 +1002,7 @@ PortableGroup::Properties_out::operator= (Properties *p) return *this; } -ACE_INLINE +ACE_INLINE PortableGroup::Properties_out::operator ::PortableGroup::Properties *&() // cast { return this->ptr_; @@ -801,7 +1031,7 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_LOCATIONS_CI_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_LOCATIONS_CI_ @@ -814,24 +1044,24 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) ACE_NEW_RETURN (retval, PortableGroup::Location[size], 0); return retval; } - + ACE_INLINE void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::freebuf (PortableGroup::Location *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::_TAO_Unbounded_Sequence_PortableGroup_Locations (void) // Default constructor. { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::_TAO_Unbounded_Sequence_PortableGroup_Locations (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableGroup_Locations::allocbuf (maximum)) { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::_TAO_Unbounded_Sequence_PortableGroup_Locations (CORBA::ULong maximum, CORBA::ULong length, @@ -840,7 +1070,7 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::_TAO_Unbounded_Sequence_PortableGroup_Locations (const _TAO_Unbounded_Sequence_PortableGroup_Locations &rhs) // Copy constructor. @@ -850,10 +1080,10 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) { PortableGroup::Location *tmp1 = _TAO_Unbounded_Sequence_PortableGroup_Locations::allocbuf (this->maximum_); PortableGroup::Location * const tmp2 = ACE_reinterpret_cast (PortableGroup::Location * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -861,14 +1091,14 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) this->buffer_ = 0; } } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::operator= (const _TAO_Unbounded_Sequence_PortableGroup_Locations &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -881,18 +1111,18 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) } else this->buffer_ = _TAO_Unbounded_Sequence_PortableGroup_Locations::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + PortableGroup::Location *tmp1 = ACE_reinterpret_cast (PortableGroup::Location *, this->buffer_); PortableGroup::Location * const tmp2 = ACE_reinterpret_cast (PortableGroup::Location * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE PortableGroup::Location & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::operator[] (CORBA::ULong i) @@ -902,7 +1132,7 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) PortableGroup::Location* tmp = ACE_reinterpret_cast(PortableGroup::Location*,this->buffer_); return tmp[i]; } - + ACE_INLINE const PortableGroup::Location & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::operator[] (CORBA::ULong i) const // operator [] @@ -911,9 +1141,9 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) PortableGroup::Location * const tmp = ACE_reinterpret_cast (PortableGroup::Location* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ACE_INLINE PortableGroup::Location * PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::get_buffer (CORBA::Boolean orphan) { @@ -947,13 +1177,13 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) } return result; } - + ACE_INLINE const PortableGroup::Location * PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::get_buffer (void) const { return ACE_reinterpret_cast(const PortableGroup::Location * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_Locations::replace (CORBA::ULong max, CORBA::ULong length, @@ -970,11 +1200,11 @@ PortableGroup::Properties_out::operator[] (CORBA::ULong index) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEGROUP_LOCATIONS_CI_) #define _PORTABLEGROUP_LOCATIONS_CI_ @@ -1030,7 +1260,7 @@ PortableGroup::Locations_var::operator= (const ::PortableGroup::Locations_var &p { Locations *deep_copy = new Locations (*p.ptr_); - + if (deep_copy != 0) { Locations *tmp = deep_copy; @@ -1040,7 +1270,7 @@ PortableGroup::Locations_var::operator= (const ::PortableGroup::Locations_var &p } } } - + return *this; } @@ -1056,27 +1286,27 @@ PortableGroup::Locations_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE PortableGroup::Locations_var::operator const ::PortableGroup::Locations &() const // cast { return *this->ptr_; } -ACE_INLINE -PortableGroup::Locations_var::operator ::PortableGroup::Locations &() // cast +ACE_INLINE +PortableGroup::Locations_var::operator ::PortableGroup::Locations &() // cast { return *this->ptr_; } -ACE_INLINE -PortableGroup::Locations_var::operator ::PortableGroup::Locations &() const // cast +ACE_INLINE +PortableGroup::Locations_var::operator ::PortableGroup::Locations &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableGroup::Locations_var::operator ::PortableGroup::Locations *&() // cast +PortableGroup::Locations_var::operator ::PortableGroup::Locations *&() // cast { return this->ptr_; } @@ -1105,7 +1335,7 @@ PortableGroup::Locations_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableGroup::Locations *& PortableGroup::Locations_var::out (void) { @@ -1166,7 +1396,7 @@ PortableGroup::Locations_out::operator= (Locations *p) return *this; } -ACE_INLINE +ACE_INLINE PortableGroup::Locations_out::operator ::PortableGroup::Locations *&() // cast { return this->ptr_; @@ -1244,7 +1474,7 @@ PortableGroup::FactoryInfo_var::operator= (const ::PortableGroup::FactoryInfo_va { FactoryInfo *deep_copy = new FactoryInfo (*p.ptr_); - + if (deep_copy != 0) { FactoryInfo *tmp = deep_copy; @@ -1254,7 +1484,7 @@ PortableGroup::FactoryInfo_var::operator= (const ::PortableGroup::FactoryInfo_va } } } - + return *this; } @@ -1277,20 +1507,20 @@ PortableGroup::FactoryInfo_var::operator const ::PortableGroup::FactoryInfo &() } ACE_INLINE -PortableGroup::FactoryInfo_var::operator ::PortableGroup::FactoryInfo &() // cast +PortableGroup::FactoryInfo_var::operator ::PortableGroup::FactoryInfo &() // cast { return *this->ptr_; } ACE_INLINE -PortableGroup::FactoryInfo_var::operator ::PortableGroup::FactoryInfo &() const // cast +PortableGroup::FactoryInfo_var::operator ::PortableGroup::FactoryInfo &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableGroup::FactoryInfo_var::operator ::PortableGroup::FactoryInfo *&() // cast +PortableGroup::FactoryInfo_var::operator ::PortableGroup::FactoryInfo *&() // cast { return this->ptr_; } @@ -1307,7 +1537,7 @@ PortableGroup::FactoryInfo_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableGroup::FactoryInfo *& PortableGroup::FactoryInfo_var::out (void) { @@ -1368,7 +1598,7 @@ PortableGroup::FactoryInfo_out::operator= (FactoryInfo *p) return *this; } -ACE_INLINE +ACE_INLINE PortableGroup::FactoryInfo_out::operator ::PortableGroup::FactoryInfo *&() // cast { return this->ptr_; @@ -1388,7 +1618,7 @@ PortableGroup::FactoryInfo_out::operator-> (void) #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_FACTORYINFOS_CI_) #define __TAO_UNBOUNDED_SEQUENCE_PORTABLEGROUP_FACTORYINFOS_CI_ @@ -1401,24 +1631,24 @@ PortableGroup::FactoryInfo_out::operator-> (void) ACE_NEW_RETURN (retval, PortableGroup::FactoryInfo[size], 0); return retval; } - + ACE_INLINE void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::freebuf (PortableGroup::FactoryInfo *buffer) // Free the sequence. { delete [] buffer; } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (void) // Default constructor. { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (CORBA::ULong maximum) // Constructor using a maximum length value. : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::allocbuf (maximum)) { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (CORBA::ULong maximum, CORBA::ULong length, @@ -1427,7 +1657,7 @@ PortableGroup::FactoryInfo_out::operator-> (void) : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos (const _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos &rhs) // Copy constructor. @@ -1437,10 +1667,10 @@ PortableGroup::FactoryInfo_out::operator-> (void) { PortableGroup::FactoryInfo *tmp1 = _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::allocbuf (this->maximum_); PortableGroup::FactoryInfo * const tmp2 = ACE_reinterpret_cast (PortableGroup::FactoryInfo * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + this->buffer_ = tmp1; } else @@ -1448,14 +1678,14 @@ PortableGroup::FactoryInfo_out::operator-> (void) this->buffer_ = 0; } } - + ACE_INLINE PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::operator= (const _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos &rhs) // Assignment operator. { if (this == &rhs) return *this; - + if (this->release_) { if (this->maximum_ < rhs.maximum_) @@ -1468,18 +1698,18 @@ PortableGroup::FactoryInfo_out::operator-> (void) } else this->buffer_ = _TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::allocbuf (rhs.maximum_); - + TAO_Unbounded_Base_Sequence::operator= (rhs); - + PortableGroup::FactoryInfo *tmp1 = ACE_reinterpret_cast (PortableGroup::FactoryInfo *, this->buffer_); PortableGroup::FactoryInfo * const tmp2 = ACE_reinterpret_cast (PortableGroup::FactoryInfo * ACE_CAST_CONST, rhs.buffer_); - + for (CORBA::ULong i = 0; i < this->length_; ++i) tmp1[i] = tmp2[i]; - + return *this; } - + // = Accessors. ACE_INLINE PortableGroup::FactoryInfo & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::operator[] (CORBA::ULong i) @@ -1489,7 +1719,7 @@ PortableGroup::FactoryInfo_out::operator-> (void) PortableGroup::FactoryInfo* tmp = ACE_reinterpret_cast(PortableGroup::FactoryInfo*,this->buffer_); return tmp[i]; } - + ACE_INLINE const PortableGroup::FactoryInfo & PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::operator[] (CORBA::ULong i) const // operator [] @@ -1498,9 +1728,9 @@ PortableGroup::FactoryInfo_out::operator-> (void) PortableGroup::FactoryInfo * const tmp = ACE_reinterpret_cast (PortableGroup::FactoryInfo* ACE_CAST_CONST, this->buffer_); return tmp[i]; } - + // Implement the TAO_Base_Sequence methods (see Sequence.h) - + ACE_INLINE PortableGroup::FactoryInfo * PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::get_buffer (CORBA::Boolean orphan) { @@ -1534,13 +1764,13 @@ PortableGroup::FactoryInfo_out::operator-> (void) } return result; } - + ACE_INLINE const PortableGroup::FactoryInfo * PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::get_buffer (void) const { return ACE_reinterpret_cast(const PortableGroup::FactoryInfo * ACE_CAST_CONST, this->buffer_); } - + ACE_INLINE void PortableGroup::_TAO_Unbounded_Sequence_PortableGroup_FactoryInfos::replace (CORBA::ULong max, CORBA::ULong length, @@ -1557,11 +1787,11 @@ PortableGroup::FactoryInfo_out::operator-> (void) this->buffer_ = data; this->release_ = release; } - + #endif /* end #if !defined */ -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ +#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ #if !defined (_PORTABLEGROUP_FACTORYINFOS_CI_) #define _PORTABLEGROUP_FACTORYINFOS_CI_ @@ -1617,7 +1847,7 @@ PortableGroup::FactoryInfos_var::operator= (const ::PortableGroup::FactoryInfos_ { FactoryInfos *deep_copy = new FactoryInfos (*p.ptr_); - + if (deep_copy != 0) { FactoryInfos *tmp = deep_copy; @@ -1627,7 +1857,7 @@ PortableGroup::FactoryInfos_var::operator= (const ::PortableGroup::FactoryInfos_ } } } - + return *this; } @@ -1643,27 +1873,27 @@ PortableGroup::FactoryInfos_var::operator-> (void) return this->ptr_; } -ACE_INLINE +ACE_INLINE PortableGroup::FactoryInfos_var::operator const ::PortableGroup::FactoryInfos &() const // cast { return *this->ptr_; } -ACE_INLINE -PortableGroup::FactoryInfos_var::operator ::PortableGroup::FactoryInfos &() // cast +ACE_INLINE +PortableGroup::FactoryInfos_var::operator ::PortableGroup::FactoryInfos &() // cast { return *this->ptr_; } -ACE_INLINE -PortableGroup::FactoryInfos_var::operator ::PortableGroup::FactoryInfos &() const // cast +ACE_INLINE +PortableGroup::FactoryInfos_var::operator ::PortableGroup::FactoryInfos &() const // cast { return *this->ptr_; } // variable-size types only ACE_INLINE -PortableGroup::FactoryInfos_var::operator ::PortableGroup::FactoryInfos *&() // cast +PortableGroup::FactoryInfos_var::operator ::PortableGroup::FactoryInfos *&() // cast { return this->ptr_; } @@ -1692,7 +1922,7 @@ PortableGroup::FactoryInfos_var::inout (void) return *this->ptr_; } -// mapping for variable size +// mapping for variable size ACE_INLINE ::PortableGroup::FactoryInfos *& PortableGroup::FactoryInfos_var::out (void) { @@ -1753,7 +1983,7 @@ PortableGroup::FactoryInfos_out::operator= (FactoryInfos *p) return *this; } -ACE_INLINE +ACE_INLINE PortableGroup::FactoryInfos_out::operator ::PortableGroup::FactoryInfos *&() // cast { return this->ptr_; @@ -1856,7 +2086,7 @@ PortableGroup::FactoryInfos_out::operator[] (CORBA::ULong index) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableGroup::TagGroupTaggedComponent &_tao_aggregate) { if ( - (strm << _tao_aggregate.version) && + (strm << _tao_aggregate.component_version) && (strm << _tao_aggregate.group_domain_id.in ()) && (strm << _tao_aggregate.object_group_id) && (strm << _tao_aggregate.object_group_ref_version) @@ -1864,13 +2094,13 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableGroup:: return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableGroup::TagGroupTaggedComponent &_tao_aggregate) { if ( - (strm >> _tao_aggregate.version) && + (strm >> _tao_aggregate.component_version) && (strm >> _tao_aggregate.group_domain_id.out ()) && (strm >> _tao_aggregate.object_group_id) && (strm >> _tao_aggregate.object_group_ref_version) @@ -1878,9 +2108,24 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableGroup::TagGrou return 1; else return 0; - + } + +#if !defined _TAO_CDR_OP_PortableGroup_GroupIIOPProfile_I_ +#define _TAO_CDR_OP_PortableGroup_GroupIIOPProfile_I_ + +CORBA::Boolean TAO_PortableGroup_Export operator<< ( + TAO_OutputCDR &, + const PortableGroup::GroupIIOPProfile & + ); +CORBA::Boolean TAO_PortableGroup_Export operator>> ( + TAO_InputCDR &, + PortableGroup::GroupIIOPProfile & + ); + +#endif /* _TAO_CDR_OP_PortableGroup_GroupIIOPProfile_I_ */ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableGroup::Property &_tao_aggregate) { if ( @@ -1890,7 +2135,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableGroup:: return 1; else return 0; - + } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableGroup::Property &_tao_aggregate) @@ -1902,7 +2147,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableGroup::Propert return 1; else return 0; - + } diff --git a/TAO/tao/PortableGroup/UIPMC_Connector.cpp b/TAO/tao/PortableGroup/UIPMC_Connector.cpp index 6c2ead8e2a3..694fa3bc84c 100644 --- a/TAO/tao/PortableGroup/UIPMC_Connector.cpp +++ b/TAO/tao/PortableGroup/UIPMC_Connector.cpp @@ -151,8 +151,6 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr) TAO_Profile * TAO_UIPMC_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV) { - ACE_DEBUG ((LM_DEBUG, "TAO_UIPMC_Connector::make_profile: Shouldn't be here!!\n")); - TAO_Profile *profile = 0; ACE_NEW_THROW_EX (profile, TAO_UIPMC_Profile (this->orb_core ()), @@ -173,24 +171,19 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint) if (!endpoint || !*endpoint) return -1; // Failure - const char *protocol[] = { "uipmc", "uipmcloc" }; + const char *protocol[] = { "miop" }; size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint; - size_t len0 = ACE_OS::strlen (protocol[0]); - size_t len1 = ACE_OS::strlen (protocol[1]); // Check for the proper prefix in the IOR. If the proper prefix // isn't in the IOR then it is not an IOR we can use. if (slot == len0 && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0) return 0; - else if (slot == len1 - && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0) - return 0; return -1; - // Failure: not an UIPMC IOR + // Failure: not a MIOP IOR // DO NOT throw an exception here. } diff --git a/TAO/tao/PortableGroup/UIPMC_Endpoint.cpp b/TAO/tao/PortableGroup/UIPMC_Endpoint.cpp index 1379a2e6f91..0726cfa4825 100644 --- a/TAO/tao/PortableGroup/UIPMC_Endpoint.cpp +++ b/TAO/tao/PortableGroup/UIPMC_Endpoint.cpp @@ -39,7 +39,7 @@ TAO_UIPMC_Endpoint::TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4], next_ (0) { for (int i = 0; i<4; i++) - class_d_address_[i] = class_d_address[i]; + this->class_d_address_[i] = class_d_address[i]; this->update_object_addr (); } @@ -55,8 +55,17 @@ TAO_UIPMC_Endpoint::object_addr (const ACE_INET_Addr &addr) { this->port_ = addr.get_port_number(); this->uint_ip_addr (addr.get_ip_address ()); + + this->object_addr_.set (addr); } +const char * +TAO_UIPMC_Endpoint::get_host_addr (void) const +{ + return this->object_addr_.get_host_addr (); +} + + int TAO_UIPMC_Endpoint::addr_to_string (char *buffer, size_t length) { diff --git a/TAO/tao/PortableGroup/UIPMC_Endpoint.h b/TAO/tao/PortableGroup/UIPMC_Endpoint.h index 119fde4320d..17446911755 100644 --- a/TAO/tao/PortableGroup/UIPMC_Endpoint.h +++ b/TAO/tao/PortableGroup/UIPMC_Endpoint.h @@ -38,9 +38,6 @@ class TAO_PortableGroup_Export TAO_UIPMC_Endpoint : public TAO_Endpoint { public: - - friend class TAO_UIPMC_Profile; - // = Initialization and termination methods. /// Default constructor. @@ -49,7 +46,7 @@ public: /// Constructor. TAO_UIPMC_Endpoint (const ACE_INET_Addr &addr); - /// Constructor. + /// Constructor. @@ Frank - deprecate this. TAO_UIPMC_Endpoint (const CORBA::Octet class_d_address[4], CORBA::UShort port); @@ -83,11 +80,15 @@ public: /// Set the IP multicast address and port. void object_addr (const ACE_INET_Addr &addr); + /// Return a pointer to the stringified host address (not including the + /// port). This class retains ownership of the address memory. + const char *get_host_addr (void) const; + /// Return the port number. CORBA::UShort port (void) const; /// Set the port number. - CORBA::UShort port (CORBA::UShort p); + CORBA::UShort port (CORBA::UShort p); //@@ Frank - deprecate this. //TAO_UIPMC_Connection_Handler *&hint (void); // Access to our <hint_>. @@ -102,10 +103,10 @@ private: /// Helper method to update the cached object address. void update_object_addr (void); - /// IP Multicast address. + /// IP Multicast address. @@ Frank - deprecate this. CORBA::Octet class_d_address_[4]; - /// UDP port number. + /// UDP port number. @@ Frank - deprecate this. CORBA::UShort port_; /// Cached instance of <ACE_INET_Addr> for use in making diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index fc4aa2c9acb..544b1279256 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -311,18 +311,62 @@ TAO_Profile::verify_profile_version (CORBA::Environment &ACE_TRY_ENV) } } -void -TAO_Profile::request_target_specifier (TAO_Target_Specification &target_spec) +void +TAO_Profile::request_target_specifier ( + TAO_Target_Specification &target_spec, + TAO_Target_Specification::TAO_Target_Address required_type, + CORBA::Environment &ACE_TRY_ENV) { - // @@ Frank - Note: This will need to be moved to handle exception - // cases where the remote doesn't like the target specifier that - // we picked. - // - // Almost 100% of the time, the request target specifier is the object - // key, so this is the default. For the odd case where a pluggable - // protocol needs to change this, it can override this method. - - target_spec.target_specifier (this->object_key ()); + // Fill out the target specifier based on the required type. + switch (required_type) + { + case TAO_Target_Specification::Default_Addr: + case TAO_Target_Specification::Key_Addr: + // Almost 100% of the time, the request target specifier is the object + // key, so this is the default. For the odd case where a pluggable + // protocol needs to change this, it can override this method. + + target_spec.target_specifier (this->object_key ()); + break; + + case TAO_Target_Specification::Profile_Addr: + + target_spec.target_specifier ( + this->create_tagged_profile ()); + break; + + case TAO_Target_Specification::Reference_Addr: + { + // We need to call the method seperately. If there is no + // IOP::IOR info, the call would create the info and return the + // index that we need. + CORBA::ULong index = 0; + IOP::IOR *ior_info = 0; + int retval = this->stub_->create_ior_info (ior_info, + index, + ACE_TRY_ENV); + ACE_CHECK; + + if (retval == -1) + { + if (TAO_debug_level > 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) Error in finding index for \n") + ACE_TEXT ("IOP::IOR \n"))); + } + ACE_THROW (CORBA::MARSHAL ()); + } + + target_spec.target_specifier (*ior_info, + index); + break; + } + + default: + // Unknown required type. Throw an exception. + ACE_THROW (CORBA::MARSHAL ()); + } } int diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index ee2c86b2bfa..3dd5b39236a 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -24,12 +24,12 @@ #include "Tagged_Components.h" #include "PolicyC.h" #include "GIOP_Message_State.h" +#include "target_specification.h" class TAO_MProfile; class TAO_Stub; class TAO_Endpoint; class TAO_ORB_Core; -class TAO_Target_Specification; /** * @class TAO_Profile @@ -162,7 +162,10 @@ public: /// Set the target spec to point to the appropriate object in the /// TAO_Profile instance for a request. - virtual void request_target_specifier (TAO_Target_Specification &target_spec); + virtual void request_target_specifier ( + TAO_Target_Specification &target_spec, + TAO_Target_Specification::TAO_Target_Address required_type, + CORBA::Environment &ACE_TRY_ENV); /// Returns true if this profile can specify multicast endpoints. virtual int supports_multicast (void) const; diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index af0ecc4eebd..f8c45a175c5 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -22,6 +22,7 @@ #include "Buffering_Constraint_Policy.h" #include "Messaging_Policy_i.h" #include "Client_Priority_Policy.h" +#include "target_specification.h" #include "debug.h" #if (TAO_HAS_RT_CORBA == 1) @@ -59,7 +60,7 @@ TAO_Stub::TAO_Stub (const char *repository_id, #if (TAO_HAS_CORBA_MESSAGING == 1) policies_ (0), #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - addressing_mode_ (0), + addressing_mode_ (TAO_Target_Specification::Default_Addr), ior_info_ (0), forwarded_ior_info_ (0) { diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 2d35703b36d..1e8ee2e8d18 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -1692,6 +1692,7 @@ TAO_NAMESPACE_CLOSE // end of class (namespace) CORBA //#define TAO_TAG_SOME_OTHER_TAG 0x54414f03U // Tag for specifying object groups - see MIOP specification #define TAO_TAG_GROUP 0x54414f03U +#define TAO_TAG_GROUP_IIOP 0x54414f04U // We reserved the range 0x54414f00 - 0x54414f0f with the OMG to // define our own service context list entries. diff --git a/TAO/tao/tao-dll.icc b/TAO/tao/tao-dll.icc index 9540d32b9c2..53c95ef9631 100644 --- a/TAO/tao/tao-dll.icc +++ b/TAO/tao/tao-dll.icc @@ -1,118 +1,236 @@ if $__TOS_WIN__ { + option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("TAO_HAS_DLL","0"), + define("TAO_BUILD_DLL","0") + TARG = "tao.dll" + } + if $__TOS_AIX__ { + option PlatformOptions = null + TARG = "tao.shr.a" + } + + + option + PlatformOptions, + define("ACE_HAS_DLL","0"), + define ("__ACE_INLINE__","0"), + incl(searchPath,'H:\ACE_wrappers'), + incl(searchPath,'H:\ACE_wrappers\TAO'), + link(exportAll), + link(linkwithsharedlib), + link(linkWithMultiThreadLib,yes), + link(libSearchPath,'H:\ACE_wrappers\ace'), + link(linkWithMultiThreadLib,yes) + { + target type(dll) TARG + { + option macros(global) + { + source type(cpp) "ace/OS.h" + source type(cpp) "ace/ACE.h" + source type(cpp) "tao/TAO.h" + } + + source type (cpp) "Active_Object_Map.cpp" + source type (cpp) "Any.cpp" + source type (cpp) "CDR.cpp" + source type (cpp) "CORBA_String.cpp" + source type (cpp) "Client_Strategy_Factory.cpp" + source type (cpp) "Connect.cpp" + source type (cpp) "CurrentC.cpp" + source type (cpp) "Environment.cpp" + source type (cpp) "Exception.cpp" + source type (cpp) "Forwarding_Servant.cpp" + source type (cpp) "GIOP.cpp" + source type (cpp) "IIOP_Acceptor.cpp" + source type (cpp) "IIOP_Connector.cpp" + source type (cpp) "IIOP_Interpreter.cpp" + source type (cpp) "IIOP_ORB.cpp" + source type (cpp) "IIOP_Profile.cpp" + source type (cpp) "IIOP_Transport.cpp" + source type (cpp) "Invocation.cpp" + source type (cpp) "MProfile.cpp" + source type (cpp) "Managed_Types.cpp" + source type (cpp) "Marshal.cpp" + source type (cpp) "NVList.cpp" + source type (cpp) "ORB.cpp" + source type (cpp) "ORB_Core.cpp" + source type (cpp) "ORB_Strategies_T.cpp" + source type (cpp) "Object.cpp" + source type (cpp) "Object_KeyC.cpp" + source type (cpp) "Operation_Table.cpp" + source type (cpp) "POA.cpp" + source type (cpp) "PortableServerC.cpp" + source type (cpp) "Pluggable.cpp" + source type (cpp) "Transport.cpp" + source type (cpp) "PolicyC.cpp" + source type (cpp) "PolicyS.cpp" + source type (cpp) "Principal.cpp" + source type (cpp) "Request.cpp" + source type (cpp) "Sequence.cpp" + source type (cpp) "Sequence_T.cpp" + source type (cpp) "Servant_Base.cpp" + source type (cpp) "Server_Request.cpp" + source type (cpp) "Server_Strategy_Factory.cpp" + source type (cpp) "Stub.cpp" + source type (cpp) "TAO.cpp" + source type (cpp) "TAO_Internal.cpp" + source type (cpp) "Typecode.cpp" + source type (cpp) "Typecode_Constants.cpp" + source type (cpp) "Union.cpp" + source type (cpp) "append.cpp" + source type (cpp) "debug.cpp" + source type (cpp) "decode.cpp" + source type (cpp) "deep_free.cpp" + source type (cpp) "default_client.cpp" + source type (cpp) "default_server.cpp" + source type (cpp) "encode.cpp" + source type (cpp) "params.cpp" + source type (cpp) "poa_T.cpp" + source type (cpp) "skip.cpp" + source type (cpp) "t-sizes.cpp" + source type (cpp) "varout.cpp" + // Template implementation files (#pragma implementation) + source type (cpp) "DynUnion_i_T.cpp" + source type (cpp) "ORB_Strategies_T.cpp" + source type (cpp) "Sequence_T.cpp" + source type (cpp) "poa_T.cpp" + source type (cpp) "varout.cpp" + + // Libraries + if $__TOS_WIN__ { + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + if $__TOS_AIX__ { + source type (lib) "aced.shr.a" + source type (lib) "libtli_r.a" + source type (lib) "libpthreads.a" + source type (lib) "libc_r.a" + } + } + } + diff --git a/TAO/tao/tao-lib.icc b/TAO/tao/tao-lib.icc index 646a11a1b16..86e32d0fa70 100644 --- a/TAO/tao/tao-lib.icc +++ b/TAO/tao/tao-lib.icc @@ -1,118 +1,236 @@ if $__TOS_WIN__ { + option PlatformOptions = define ("ACE_HAS_WINSOCK2","1"), + define ("WIN32","1"), + define ("_WINDOWS","1"), + define("TAO_HAS_DLL","0"), + define("TAO_BUILD_DLL","0") + TARG = "tao.lib" + } + if $__TOS_AIX__ { + option PlatformOptions = null + TARG = "tao.a" + } + + + option + PlatformOptions, + define("ACE_HAS_DLL","0"), + define ("__ACE_INLINE__","0"), + incl(searchPath,'H:\ACE_wrappers'), + incl(searchPath,'H:\ACE_wrappers\TAO'), + link(exportAll), + link(linkwithsharedlib), + link(linkWithMultiThreadLib,yes), + link(libSearchPath,'H:\ACE_wrappers\ace'), + link(linkWithMultiThreadLib,yes) + { + target type(lib) TARG + { + option macros(global) + { + source type(cpp) "ace/OS.h" + source type(cpp) "ace/ACE.h" + source type(cpp) "tao/TAO.h" + } + + source type (cpp) "Active_Object_Map.cpp" + source type (cpp) "Any.cpp" + source type (cpp) "CDR.cpp" + source type (cpp) "CORBA_String.cpp" + source type (cpp) "Client_Strategy_Factory.cpp" + source type (cpp) "Connect.cpp" + source type (cpp) "CurrentC.cpp" + source type (cpp) "Environment.cpp" + source type (cpp) "Exception.cpp" + source type (cpp) "Forwarding_Servant.cpp" + source type (cpp) "GIOP.cpp" + source type (cpp) "IIOP_Acceptor.cpp" + source type (cpp) "IIOP_Connector.cpp" + source type (cpp) "IIOP_Interpreter.cpp" + source type (cpp) "IIOP_ORB.cpp" + source type (cpp) "IIOP_Profile.cpp" + source type (cpp) "IIOP_Transport.cpp" + source type (cpp) "Invocation.cpp" + source type (cpp) "MProfile.cpp" + source type (cpp) "Managed_Types.cpp" + source type (cpp) "Marshal.cpp" + source type (cpp) "NVList.cpp" + source type (cpp) "ORB.cpp" + source type (cpp) "ORB_Core.cpp" + source type (cpp) "ORB_Strategies_T.cpp" + source type (cpp) "Object.cpp" + source type (cpp) "Object_KeyC.cpp" + source type (cpp) "Operation_Table.cpp" + source type (cpp) "POA.cpp" + source type (cpp) "PortableServerC.cpp" + source type (cpp) "Pluggable.cpp" + source type (cpp) "Transport.cpp" + source type (cpp) "PolicyC.cpp" + source type (cpp) "PolicyS.cpp" + source type (cpp) "Principal.cpp" + source type (cpp) "Request.cpp" + source type (cpp) "Sequence.cpp" + source type (cpp) "Sequence_T.cpp" + source type (cpp) "Servant_Base.cpp" + source type (cpp) "Server_Request.cpp" + source type (cpp) "Server_Strategy_Factory.cpp" + source type (cpp) "Stub.cpp" + source type (cpp) "TAO.cpp" + source type (cpp) "TAO_Internal.cpp" + source type (cpp) "Typecode.cpp" + source type (cpp) "Typecode_Constants.cpp" + source type (cpp) "Union.cpp" + source type (cpp) "append.cpp" + source type (cpp) "debug.cpp" + source type (cpp) "decode.cpp" + source type (cpp) "deep_free.cpp" + source type (cpp) "default_client.cpp" + source type (cpp) "default_server.cpp" + source type (cpp) "encode.cpp" + source type (cpp) "params.cpp" + source type (cpp) "poa_T.cpp" + source type (cpp) "skip.cpp" + source type (cpp) "t-sizes.cpp" + source type (cpp) "varout.cpp" + // Template implementation files (#pragma implementation) + source type (cpp) "DynUnion_i_T.cpp" + source type (cpp) "ORB_Strategies_T.cpp" + source type (cpp) "Sequence_T.cpp" + source type (cpp) "poa_T.cpp" + source type (cpp) "varout.cpp" + + // Libraries + if $__TOS_WIN__ { + source type (lib) "aced.lib" + source type (lib) "advapi32.lib" + source type (lib) "user32.lib" + source type (lib) "ws2_32.lib" + source type (lib) "wsock32.lib" + source type (lib) "mswsock.lib" + } + if $__TOS_AIX__ { + source type (lib) "aced.a" + source type (lib) "libtli_r.a" + source type (lib) "libpthreads.a" + source type (lib) "libc_r.a" + } + } + } + diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index 488511a0ca8..78e4b67850e 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -54,7 +54,7 @@ class TAO_Export TAO_Target_Specification // writing a novel or your memoirs, 'I foresee' does not look like // the right kind of comment in a class description. // - // The motivation behind this is GIOP 1.2 althought I foresee + // The motivation behind this is GIOP 1.2 although I foresee // other messaging protocols doing something similar. // The Invocation classes (client side) were // passing the object key that they had extracted from the @@ -74,11 +74,14 @@ public: // Note that this could be extended for other protocols Key_Addr = 0, Profile_Addr, - Reference_Addr + Reference_Addr, + Default_Addr // If an addressing mode hasn't been specified by the + // remote end, use the default for the profile that's + // in use. }; - // Note: Please do not pass in a identifiers that is allocated on - // stack. These methods does not make a copy but holds the pointer + // Note: Please do not pass in a identifiers that are allocated on + // stack. These methods do not make a copy but hold the pointer // passed in. /// Set the target specification by giving the object key. void target_specifier (const TAO_ObjectKey &key); @@ -122,18 +125,18 @@ public: TAO_Target_Address specifier (void); private: + /// The union of all possible target specifiers. union { TAO_ObjectKey *object_key_; IOP::TaggedProfile *profile_; IOP::IOR *ior_; } u_; - // The union of all the possibilities - /// The enum identifier + /// The discriminator for the above union (can't be Default_Addr). TAO_Target_Address specifier_; - /// The profile index + /// The profile index if using Reference_Addr. CORBA::ULong profile_index_; }; |