summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-02-20 17:31:20 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-02-20 17:31:20 +0000
commit3c518e1bb372a5fabd9277c8862b9f5f79ada483 (patch)
treebc965de7216ef269eb3b8bde4d14b3cd288a9839
parent21324f8d9270ee3052ebf5fd1a595e16ff3ba9f8 (diff)
downloadATCD-3c518e1bb372a5fabd9277c8862b9f5f79ada483.tar.gz
ChangeLogTag:Thu Feb 20 09:07:56 2003 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLog753
-rw-r--r--TAO/TAO_IDL/be/be_interface.cpp18
-rw-r--r--TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp8
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/operation.cpp52
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp9
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp6
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp4
-rw-r--r--TAO/tao/Abstract_Servant_Base.h34
-rw-r--r--TAO/tao/Acceptor_Filter.h1
-rw-r--r--TAO/tao/Acceptor_Impl.cpp5
-rw-r--r--TAO/tao/Acceptor_Impl.h3
-rw-r--r--TAO/tao/Adapter.h1
-rw-r--r--TAO/tao/Asynch_Invocation.h5
-rw-r--r--TAO/tao/Asynch_Queued_Message.cpp1
-rw-r--r--TAO/tao/Asynch_Reply_Dispatcher_Base.h2
-rw-r--r--TAO/tao/BiDir_GIOP/BiDirGIOP.cpp16
-rw-r--r--TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp11
-rw-r--r--TAO/tao/BoundsC.cpp10
-rw-r--r--TAO/tao/CDR.cpp2
-rw-r--r--TAO/tao/CDR.h5
-rw-r--r--TAO/tao/CDR_Encaps_Codec.cpp20
-rw-r--r--TAO/tao/CORBALOC_Parser.cpp16
-rw-r--r--TAO/tao/ClientInterceptorAdapter.cpp6
-rw-r--r--TAO/tao/ClientRequestInfo_i.cpp32
-rw-r--r--TAO/tao/ClientRequestInfo_i.h3
-rw-r--r--TAO/tao/CodecFactory.cpp4
-rw-r--r--TAO/tao/Connector_Registry.cpp6
-rw-r--r--TAO/tao/Current.pidl2
-rw-r--r--TAO/tao/DLL_Parser.cpp2
-rw-r--r--TAO/tao/DynamicAny/DynAnyFactory.cpp18
-rw-r--r--TAO/tao/DynamicAny/DynAnyFactory.h8
-rw-r--r--TAO/tao/DynamicAny/DynAny_i.cpp21
-rw-r--r--TAO/tao/DynamicAny/DynAny_i.h4
-rw-r--r--TAO/tao/DynamicAny/DynArray_i.cpp49
-rw-r--r--TAO/tao/DynamicAny/DynArray_i.h4
-rw-r--r--TAO/tao/DynamicAny/DynCommon.cpp32
-rw-r--r--TAO/tao/DynamicAny/DynCommon.h2
-rw-r--r--TAO/tao/DynamicAny/DynEnum_i.cpp21
-rw-r--r--TAO/tao/DynamicAny/DynEnum_i.h4
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.cpp22
-rw-r--r--TAO/tao/DynamicAny/DynSequence_i.h4
-rw-r--r--TAO/tao/DynamicAny/DynStruct_i.cpp33
-rw-r--r--TAO/tao/DynamicAny/DynStruct_i.h4
-rw-r--r--TAO/tao/DynamicAny/DynUnion_i.cpp51
-rw-r--r--TAO/tao/DynamicAny/DynUnion_i.h10
-rw-r--r--TAO/tao/DynamicAny/DynamicAnyC.cpp22
-rw-r--r--TAO/tao/DynamicAny/DynamicAnyC.h8
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser.h1
-rw-r--r--TAO/tao/GIOP_Message_Lite.h1
-rw-r--r--TAO/tao/IIOP_Profile.cpp14
-rw-r--r--TAO/tao/IOPC.cpp38
-rw-r--r--TAO/tao/IORManipulation/IORC.cpp34
-rw-r--r--TAO/tao/IORManipulation/IORC.h8
-rw-r--r--TAO/tao/IORTable/IORTableC.cpp12
-rw-r--r--TAO/tao/IORTable/IORTableC.h4
-rw-r--r--TAO/tao/IORTable/Table_Adapter.cpp2
-rw-r--r--TAO/tao/Interceptor_List.cpp2
-rw-r--r--TAO/tao/Invocation.cpp19
-rw-r--r--TAO/tao/Invocation_Endpoint_Selectors.cpp2
-rw-r--r--TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp4
-rw-r--r--TAO/tao/Messaging/Messaging.cpp2
-rw-r--r--TAO/tao/Messaging/MessagingC.cpp8
-rw-r--r--TAO/tao/Messaging/MessagingC.h8
-rw-r--r--TAO/tao/Messaging/MessagingC.i2
-rw-r--r--TAO/tao/Messaging/MessagingS.cpp2
-rw-r--r--TAO/tao/Messaging/Messaging_Policy_i.cpp2
-rw-r--r--TAO/tao/ORBInitInfo.cpp10
-rw-r--r--TAO/tao/ORB_Core.cpp8
-rw-r--r--TAO/tao/ObjectReferenceTemplateC.cpp4
-rw-r--r--TAO/tao/ObjectReferenceTemplateC.h2
-rw-r--r--TAO/tao/PICurrent.cpp4
-rw-r--r--TAO/tao/PICurrent.h1
-rw-r--r--TAO/tao/PolicyFactory_Registry.cpp2
-rw-r--r--TAO/tao/Policy_ForwardC.cpp4
-rw-r--r--TAO/tao/Policy_ForwardC.h5
-rw-r--r--TAO/tao/PollableC.cpp12
-rw-r--r--TAO/tao/PollableC.h4
-rw-r--r--TAO/tao/PortableInterceptorC.cpp28
-rw-r--r--TAO/tao/PortableInterceptorC.h14
-rw-r--r--TAO/tao/PortableServer/Collocated_Object.cpp12
-rw-r--r--TAO/tao/PortableServer/Collocated_Object.h24
-rw-r--r--TAO/tao/PortableServer/Collocated_Object.i2
-rw-r--r--TAO/tao/PortableServer/Default_ORTC.cpp2
-rw-r--r--TAO/tao/PortableServer/Default_ORTC.h2
-rw-r--r--TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp64
-rw-r--r--TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h23
-rw-r--r--TAO/tao/PortableServer/ImR_LocatorC.cpp14
-rw-r--r--TAO/tao/PortableServer/ImR_LocatorC.h24
-rw-r--r--TAO/tao/PortableServer/ImR_LocatorC.i2
-rw-r--r--TAO/tao/PortableServer/ImR_LocatorS.cpp26
-rw-r--r--TAO/tao/PortableServer/ImR_LocatorS.h24
-rw-r--r--TAO/tao/PortableServer/ImplRepoC.cpp70
-rw-r--r--TAO/tao/PortableServer/ImplRepoC.h56
-rw-r--r--TAO/tao/PortableServer/ImplRepoC.i6
-rw-r--r--TAO/tao/PortableServer/ImplRepoS.cpp62
-rw-r--r--TAO/tao/PortableServer/ImplRepoS.h56
-rw-r--r--TAO/tao/PortableServer/ORB_Manager.cpp2
-rw-r--r--TAO/tao/PortableServer/ObjectReferenceTemplate.cpp4
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.cpp2
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.h27
-rw-r--r--TAO/tao/PortableServer/Operation_Table.h23
-rw-r--r--TAO/tao/PortableServer/POA.cpp20
-rw-r--r--TAO/tao/PortableServer/POA.h13
-rw-r--r--TAO/tao/PortableServer/PolicyS.cpp14
-rw-r--r--TAO/tao/PortableServer/PolicyS.h12
-rw-r--r--TAO/tao/PortableServer/PortableServerC.cpp88
-rw-r--r--TAO/tao/PortableServer/PortableServerC.h12
-rw-r--r--TAO/tao/PortableServer/Servant_Base.cpp12
-rw-r--r--TAO/tao/PortableServer/Servant_Base.h13
-rw-r--r--TAO/tao/PortableServer/ServerInterceptorAdapter.cpp6
-rw-r--r--TAO/tao/PortableServer/ServerRequestInfo.cpp2
-rw-r--r--TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp2
-rw-r--r--TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h3
-rw-r--r--TAO/tao/Profile.cpp24
-rw-r--r--TAO/tao/RTCORBA/RTCORBAC.cpp22
-rw-r--r--TAO/tao/RTCORBA/RTCORBAC.h6
-rw-r--r--TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp89
-rw-r--r--TAO/tao/RTCORBA/RT_ORB_Loader.cpp34
-rw-r--r--TAO/tao/RTCORBA/RT_PolicyFactory.cpp6
-rw-r--r--TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h2
-rw-r--r--TAO/tao/RTCORBA/Thread_Pool.cpp17
-rw-r--r--TAO/tao/Request_Dispatcher.h4
-rw-r--r--TAO/tao/Sequence.cpp4
-rw-r--r--TAO/tao/Sequence_T.cpp8
-rw-r--r--TAO/tao/Sequence_T.h8
-rw-r--r--TAO/tao/Service_Callbacks.cpp19
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.cpp10
-rw-r--r--TAO/tao/Strategies/SHMIOP_Profile.cpp12
-rw-r--r--TAO/tao/Strategies/UIOP_Profile.cpp8
-rw-r--r--TAO/tao/TAO_Server_Request.h6
-rw-r--r--TAO/tao/TAO_Server_Request.i3
-rw-r--r--TAO/tao/Transport_Connector.cpp16
-rw-r--r--TAO/tao/TypeCodeFactory_Adapter.h10
-rw-r--r--TAO/tao/WrongTransactionC.cpp6
-rw-r--r--TAO/tao/corba.h1
-rw-r--r--TAO/tao/corbafwd.h1798
-rw-r--r--TAO/tao/objectid.h5
-rw-r--r--TAO/tests/ORT/ORT_test_IORInterceptor.cpp2
148 files changed, 2483 insertions, 2010 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6371f980743..62a2278d1b1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,746 @@
+Thu Feb 20 09:07:56 2003 Ossama Othman <ossama@uci.edu>
+
+ * TAO_IDL/be/be_interface.cpp (gen_stub_ctor):
+
+ Generate code that correctly uses "CORBA::Object" instead of
+ "CORBA_Object".
+
+ (gen_var_defn):
+
+ Made generated "_var" classes inherit privately from
+ TAO_Base_var instead of publically. Specifically, private
+ inheritance from TAO_Base_var is done to emphasize that
+ a given "_var" does not satisfy the IS-A relationship with
+ TAO_Base_var. "_var" classes are merely IMPLEMENTED-IN-TERMS-OF
+ TAO_Base_var. This also correctly invalidates assignments like:
+ Foo_var v;
+ TAO_Base_var * t = &v;
+
+ * TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+ (visit_exception):
+
+ Generate code that correctly uses "CORBA::UserException" instead
+ of "CORBA_UserException".
+
+ * TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+ * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+ * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+ * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+ * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+
+ Generate code that correctly uses "CORBA::Object" instead of
+ "CORBA_Object".
+
+ * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+
+ Improved "const correctness" of generated interceptor related
+ code. One of the return values is really a constant.
+
+ * TAO_IDL/be/be_visitor_operation/operation.cpp:
+
+ Fixed generated transport retry code/loop. The exception macros
+ prevent statements like "continue" and "break" from being used
+ as expected. Worked around that deficiency by using if/else
+ blocks instead.
+
+ Improved "const correctness" of generated interceptor related
+ code. One of the return values is really a constant.
+
+ * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+ * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+
+ Generate code that correctly uses "CORBA::ValueBase" instead of
+ "CORBA_ValueBase".
+
+ * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+ * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp:
+
+ Generate code that correctly uses "CORBA::ValueFactoryBase"
+ instead of "CORBA_ValueFactoryBase".
+
+ * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+ * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+ * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+
+ Generate code that correctly uses
+ "CORBA::DefaultValueRefCountBase" instead of
+ "CORBA_DefaultValueRefCountBase".
+
+ * orbsvcs/orbsvcs/PortableGroup.idl:
+
+ Use the "typeprefix" keyword instead of "#pragma prefix". The
+ former is more modern.
+
+ * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.cpp:
+
+ Corrected comment.
+
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl:
+
+ Fixed race conditions in the TAO_LB_LoadAlert class.
+
+ * orbsvcs/orbsvcs/Notify/Service.h:
+
+ Include "ace/Service_Object.h" to pull in ACE_Service_Object
+ class declaration. Necessitated by inter-header dependency
+ reductions.
+
+ * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+ (populate_object_group):
+
+ No need to pass an integral type "const" by value. Remove the
+ "const" qualifier.
+
+ * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h:
+
+ No need to include "tao/corbafwd.h".
+
+ * orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp:
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp:
+ * orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp:
+ * tao/CDR_Encaps_Codec.cpp:
+ * tao/CORBALOC_Parser.cpp:
+ * tao/CodecFactory.cpp:
+ * tao/Connector_Registry.cpp:
+ * tao/DLL_Parser.cpp:
+ * tao/IIOP_Profile.cpp:
+ * tao/Interceptor_List.cpp:
+ * tao/Invocation.cpp:
+ * tao/Invocation_Endpoint_Selectors.cpp:
+ * tao/ORBInitInfo.cpp:
+ * tao/PICurrent.cpp:
+ * tao/PolicyFactory_Registry.cpp:
+ * tao/Profile.cpp:
+ * tao/Service_Callbacks.cpp:
+ * tao/Transport_Connector.cpp:
+ * tao/BiDir_GIOP/BiDirGIOP.cpp:
+ * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp:
+ * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+ * tao/Messaging/Messaging.cpp:
+ * tao/Messaging/Messaging_Policy_i.cpp:
+ * tao/PortableServer/ObjectReferenceTemplate.cpp:
+ * tao/PortableServer/Object_Adapter.cpp:
+ * tao/PortableServer/ServerRequestInfo.cpp:
+ * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp:
+ * tao/RTCORBA/RT_PolicyFactory.cpp:
+ * tao/RTCORBA/Thread_Pool.cpp:
+ * tao/Strategies/DIOP_Profile.cpp:
+ * tao/Strategies/SHMIOP_Profile.cpp:
+ * tao/Strategies/UIOP_Profile.cpp:
+ * tests/ORT/ORT_test_IORInterceptor.cpp:
+
+ Use CORBA::SystemException instead of CORBA_SystemException.
+ The latter was an implementation detail, and part of a
+ workaround for C++ compilers that didn't support namespaces.
+
+ * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h:
+ * tao/GIOP_Message_Generator_Parser.h:
+ * tao/GIOP_Message_Lite.h:
+ * tao/PICurrent.h:
+ * tao/Request_Dispatcher.h:
+
+ Forward declare TAO_ServerRequest. Necessitated by inter-header
+ dependency reductions.
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp:
+
+ * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+
+ Removed obsolete comment.
+
+ * tao/AbstractBase.cpp:
+ * tao/AbstractBase.h:
+ * tao/AbstractBase.inl:
+ * tao/CORBA_String.cpp:
+ * tao/CORBA_String.h:
+ * tao/CORBA_String.inl:
+ * tao/CurrentC.cpp:
+ * tao/CurrentC.h:
+ * tao/DomainC.cpp:
+ * tao/DomainC.h:
+ * tao/DomainC.i:
+ * tao/Environment.cpp:
+ * tao/Environment.h:
+ * tao/Environment.i:
+ * tao/Exception.cpp:
+ * tao/Exception.h:
+ * tao/Exception.i:
+ * tao/LocalObject.cpp:
+ * tao/LocalObject.h:
+ * tao/LocalObject.i:
+ * tao/NVList.cpp:
+ * tao/NVList.h:
+ * tao/NVList.i:
+ * tao/ORB.cpp:
+ * tao/ORB.h:
+ * tao/ORB.i:
+ * tao/OctetSeqC.cpp:
+ * tao/OctetSeqC.h:
+ * tao/OctetSeqC.i:
+ * tao/PolicyC.cpp:
+ * tao/PolicyC.h:
+ * tao/PolicyC.i:
+ * tao/Principal.cpp:
+ * tao/Principal.h:
+ * tao/Principal.i:
+ * tao/Services.cpp:
+ * tao/Services.h:
+ * tao/Services.i:
+ * tao/StringSeqC.cpp:
+ * tao/StringSeqC.h:
+ * tao/StringSeqC.i:
+ * tao/Typecode.cpp:
+ * tao/Typecode.h:
+ * tao/Typecode.i:
+ * tao/Typecode_Constants.cpp:
+ * tao/ValueBase.cpp:
+ * tao/ValueBase.h:
+ * tao/ValueBase.i:
+ * tao/ValueFactory.cpp:
+ * tao/ValueFactory.h:
+ * tao/ValueFactory.i:
+
+ Moved all "CORBA_" classes into a true CORBA namespace, and
+ dropped the "CORBA_" workaround for compilers that lacked
+ C++ namespace support.
+
+ * tao/Abstract_Servant_Base.h:
+
+ Moved "TAO_Skeleton" function typedef to this file. This change
+ is part of set of inter-header dependency reductions.
+
+ * tao/Acceptor_Filter.h:
+ * tao/Adapter.h:
+
+ Forward declare TAO_ObjectKey. Necessitated by inter-header
+ dependency reductions.
+
+ * tao/Acceptor_Impl.cpp:
+
+ Include "tao/Transport.h". Necessitated by inter-header
+ dependency reductions.
+
+ * tao/Acceptor_Impl.h:
+ * tao/CDR.h:
+
+ Fixed doxygen documentation.
+
+ * tao/Asynch_Invocation.h:
+
+ No need to include "tao/Asynch_Reply_Dispatcher_Base.h".
+ Forward declaring "TAO_Asynch_Reply_Dispatcher_Base" is enough.
+
+ * tao/Asynch_Queued_Message.cpp:
+
+ Include "ace/Message_Block.h". Necessitated by inter-header
+ dependency reductions.
+
+ * tao/Asynch_Reply_Dispatcher_Base.h:
+
+ No need to include "tao/orbconf.h" Including "tao/TAO_Export.h"
+ is enough.
+
+ * tao/BoundsC.cpp:
+ * tao/IOPC.cpp:
+ * tao/PollableC.cpp:
+ * tao/PortableInterceptorC.cpp:
+ * tao/WrongTransactionC.cpp:
+ * tao/DynamicAny/DynamicAnyC.cpp
+ * tao/IORTable/IORTableC.cpp:
+ * tao/PortableServer/PortableServerC.cpp:
+ * tao/RTCORBA/RTCORBAC.cpp:
+
+ Use CORBA::UserException instead of CORBA_UserException.
+ The latter was an implementation detail, and part of a
+ workaround for C++ compilers that didn't support namespaces.
+
+ * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+ * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp:
+ * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp:
+ * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+ * tao/CDR.cpp:
+ * tao/Current.pidl:
+ * tao/Policy_ForwardC.cpp:
+ * tao/Policy_ForwardC.h:
+ * tao/ORB_Core.cpp:
+ * tao/ObjectReferenceTemplateC.cpp:
+ * tao/ObjectReferenceTemplateC.h:
+ * tao/PollableC.h:
+ * tao/PortableInterceptorC.h:
+ * tao/Sequence.cpp:
+ * tao/Sequence_T.cpp:
+ * tao/Sequence_T.h:
+ * tao/TAO_Server_Request.h:
+ * tao/TAO_Server_Request.i:
+ * tao/TypeCodeFactory_Adapter.h:
+ * tao/objectid.h:
+ * tao/DynamicAny/DynAnyFactory.cpp:
+ * tao/DynamicAny/DynAnyFactory.h:
+ * tao/DynamicAny/DynAny_i.cpp:
+ * tao/DynamicAny/DynAny_i.h:
+ * tao/DynamicAny/DynArray_i.cpp:
+ * tao/DynamicAny/DynArray_i.h:
+ * tao/DynamicAny/DynCommon.cpp:
+ * tao/DynamicAny/DynCommon.h:
+ * tao/DynamicAny/DynEnum_i.cpp:
+ * tao/DynamicAny/DynEnum_i.h:
+ * tao/DynamicAny/DynSequence_i.cpp:
+ * tao/DynamicAny/DynSequence_i.h:
+ * tao/DynamicAny/DynStruct_i.cpp:
+ * tao/DynamicAny/DynStruct_i.h:
+ * tao/DynamicAny/DynUnion_i.cpp:
+ * tao/DynamicAny/DynUnion_i.h:
+ * tao/DynamicAny/DynamicAnyC.h:
+ * tao/IORManipulation/IORC.cpp:
+ * tao/IORManipulation/IORC.h:
+ * tao/IORTable/IORTableC.h:
+ * tao/IORTable/Table_Adapter.cpp:
+ * tao/Messaging/MessagingC.cpp:
+ * tao/Messaging/MessagingC.h:
+ * tao/Messaging/MessagingC.i:
+ * tao/Messaging/MessagingS.cpp:
+ * tao/PortableServer/Collocated_Object.cpp:
+ * tao/PortableServer/Collocated_Object.i:
+ * tao/PortableServer/Default_ORTC.cpp:
+ * tao/PortableServer/Default_ORTC.h:
+ * tao/PortableServer/ImR_LocatorC.cpp:
+ * tao/PortableServer/ImR_LocatorC.h:
+ * tao/PortableServer/ImR_LocatorC.i:
+ * tao/PortableServer/ImR_LocatorS.cpp:
+ * tao/PortableServer/ImR_LocatorS.h:
+ * tao/PortableServer/ImplRepoC.cpp:
+ * tao/PortableServer/ImplRepoC.h:
+ * tao/PortableServer/ImplRepoC.i:
+ * tao/PortableServer/ImplRepoS.cpp:
+ * tao/PortableServer/ImplRepoS.h:
+ * tao/PortableServer/ORB_Manager.cpp:
+ * tao/PortableServer/POA.cpp:
+ * tao/PortableServer/PolicyS.cpp:
+ * tao/PortableServer/PolicyS.h:
+ * tao/PortableServer/PortableServerC.h:
+ * tao/PortableServer/Servant_Base.cpp:
+ * tao/PortableServer/Servant_Base.h:
+ * tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp:
+ * tao/PortableServer/ThruPOA_Object_Proxy_Impl.h:
+ * tao/RTCORBA/RTCORBAC.h:
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/ClientInterceptorAdapter.cpp (receive_reply):
+ (receive_exception, receive_other):
+ * tao/ClientRequestInfo_i.cpp:
+
+ Improved "const-correctness" of code.
+
+ * tao/ClientRequestInfo_i.h:
+
+ No need to include "Service_Context.h". Forward declaring
+ "TAO_Service_Context" is enough.
+
+ * tao/Collocation_Resolver.h:
+ * tao/Connector_Registry.h:
+ * tao/Endpoint_Selector_Factory.h:
+ * tao/Invocation_Endpoint_Selectors.h:
+ * tao/Object_Ref_Table.h:
+ * tao/Transport_Connector.h:
+
+ Include "ace/CORBA_macros.h" to pull in emulated exception
+ preprocessor macros. Necessitated by inter-header dependency
+ reductions.
+
+ * tao/Connection_Handler.h (~TAO_Connection_Handler):
+ * tao/IIOP_Transport.h (~TAO_IIOP_Transport):
+
+ Made this destructor to enforce proper memory management through
+ the reference counting mechanism.
+
+ * tao/Default_Thread_Lane_Resources_Manager.h:
+ * tao/Dynamic_Adapter.h:
+ * tao/Policy_Set.h:
+ * tao/DynamicInterface/Dynamic_Adapter_Impl.h:
+ * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h:
+
+ Do not supply default environment parameter. It isn't needed in
+ these cases.
+
+ * tao/Endpoint.h:
+
+ Improved doxygen documentation.
+
+ (addr_lookup_lock_)
+
+ Improved "const-correctness" by making this member mutable.
+ This allows concrete implementations of the
+ TAO_Endpoint::object_addr() method to avoid using a hack where
+ the constness is casted away.
+
+ * tao/GIOP_Message_Base.cpp:
+ * tao/GIOP_Message_Lite.cpp:
+
+ "CORBA_Exception" -> "CORBA::Exception".
+
+ * tao/GIOP_Message_Generator_Parser_10.cpp:
+
+ "CORBA_OctetSeq" -> "CORBA::OctetSeq".
+
+ * tao/IFR_Client_Adapter.h:
+
+ "CORBA_Interface" -> "CORBA::Interface".
+
+ * tao/IIOP_Connection_Handler.cpp:
+
+ Include "tao/Wait_Strategy.h". Necessitated by inter-header
+ dependency reductions.
+
+ * tao/IIOP_Connection_Handler.h:
+
+ No need to include "ace/Acceptor.h", "tao/Wait_Strategy.h",
+ "tao/IIOP_Transport.h".
+
+ Include "ace/SOCK_Stream.h" and "ace/Svc_Handler.h" to allow
+ IIOP-specific Svc_Handler typedef to be made in this header.
+
+ * tao/IIOP_Connector.cpp:
+
+ Include "Transport.h" and "Wait_Strategy.h". Necessitated by
+ inter-header dependency reductions.
+
+ * tao/IIOP_Endpoint.h (object_addr_, object_addr_set_):
+
+ Improved "const-correctness" by making these members mutable.
+ This allows the TAO_IIOP_Endpoint::object_addr() method to avoid
+ using a hack where the constness is casted away.
+
+ * tao/IIOP_Endpoint.i (object_addr):
+
+ No longer any need to use the hack where the constness is casted
+ away since the appropriate class members are now mutable.
+
+ * tao/IIOP_Transport.cpp:
+
+ Cosmetic changes.
+
+ * tao/IOPC.h (Codec, CodecFactory):
+
+ Inherit from "CORBA::Object" instead of "CORBA_Object".
+
+ * tao/LF_Event_Loop_Thread_Helper.h:
+
+ No need to include "tao/orbconf.h"
+
+ * tao/LF_Event_Loop_Thread_Helper.inl:
+
+ Added Emacs C++ mode comment.
+
+ * tao/Leader_Follower.h:
+
+ No need to forward declare "TAO_New_Leader_Generator".
+
+ * tao/MCAST_Parser.cpp:
+
+ No need to include "ORB.h".
+
+ * tao/MCAST_Parser.h:
+
+ No need to include "ORB_Core.h".
+
+ Instead include "CORBA_String.h". Necessitated by inter-header
+ dependency reductions.
+
+ * tao/Marshal.h:
+
+ No need to include "tao/Principal.h", "tao/Any.h", "tao/ORB.h".
+
+ * tao/ORBInitInfo.h:
+
+ "CORBA_Environment" -> "CORBA::Environment".
+
+ * tao/ORBInitializer_Registry.h:
+
+ Changed underlying template array parameter from
+ "ORBInitializer_ptr" to "ORBInitializer_var" to improve memory
+ management of registered ORBInitializers.
+
+ (~TAO_ORBInitializer_Registry):
+ * tao/ORBInitializer_Registry.cpp (~TAO_ORBInitializer_Registry):
+
+ Removed declaration for this destructor. It is no longer
+ necessary with the above change in place.
+
+ (register_orb_initializer, pre_init, post_init):
+
+ Improved const-correctness.
+
+ * tao/ORB_Core.h:
+ * tao/ORB_Core.i:
+ * tao/ORB_Core_Auto_Ptr.h:
+ * tao/ORB_Core_Auto_Ptr.inl:
+ * tao/ORB_Core_Auto_Ptr.cpp:
+
+ Moved TAO_ORB_Core_Auto_Ptr class from ORB_Core.* to the new
+ ORB_Core_Auto_Ptr.* files.
+
+ * tao/Object.h:
+
+ Forward declare TAO_ObjectKey. Necessitated by inter-header
+ dependency reductions.
+
+ "CORBA_Object" -> "CORBA::Object".
+
+ Made CORBA::Object_var inherit privately from TAO_Base_var, and
+ added appropriate private copy constructor and assignment
+ operator to prevent invalid widening.
+
+ * tao/Object.i:
+ * tao/Object.cpp:
+
+ "CORBA_Object" -> "CORBA::Object".
+
+ * tao/Object_KeyC.h:
+
+ Forward declare TAO_Object_Key_var. Necessitated by the
+ "tao/corbafwd.h" cleanup.
+
+ * tao/Object_Proxy_Broker.h (TAO_Object_Proxy_Broker):
+ * tao/Object_Proxy_Broker.cpp (TAO_Object_Proxy_Broker):
+ * tao/Object_Proxy_Impl.cpp (TAO_Object_Proxy_Impl):
+
+ Removed useless constructor.
+
+ * tao/Object_Proxy_Impl.h:
+
+ Removed useless constructor.
+
+ Added missing "#pragma once".
+
+ "const CORBA::Char *" -> "const char *".
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/Profile.i:
+
+ Corrected some comments.
+
+ * tao/Protocols_Hooks.h:
+
+ Forward declare TAO_Stub. Necessitated by inter-header
+ dependency reductions.
+
+ * tao/Remote_Object_Proxy_Broker.cpp:
+ * tao/Remote_Object_Proxy_Broker.h:
+
+ Removed useless constructor and destructor.
+
+ * tao/Remote_Object_Proxy_Impl.cpp:
+
+ Removed useless constructor and destructor.
+
+ Avoided inclusion of "tao/Any.h" by directly using the
+ TAO_InputCDR::to_boolean() method instead of
+ CORBA::Any::to_boolean().
+
+ "CORBA_" -> "CORBA::".
+
+ Fixed some emulated exception macro usage.
+
+ (_get_component):
+
+ Updated to better match current TAO_IDL generated stub code.
+
+ * tao/Remote_Object_Proxy_Impl.h:
+
+ "CORBA::Char *" -> "char *".
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/Sequence.h:
+
+ Include "ace/CORBA_macros.h" and "ace/Message_Block.h".
+ Necessitated by inter-header dependency reduction.
+
+ Removed now obsolete "CORBA_Object" and "CORBA_Environment"
+ forward declarations.
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/Service_Callbacks.h:
+
+ Corrected TAO_ServerRequest forward declaration,
+ i.e. "TAO_Server_Request" to "TAO_ServerRequest".
+
+ * tao/Stub.h:
+
+ Include new "ORB_Core_Auto_Ptr.h" header to pull in
+ TAO_ORB_Core_Auto_Ptr declaration.
+
+ * tao/Stub_Factory.h:
+
+ Forward declare TAO_Stub and include "ace/CORBA_macros.h".
+ Necessitated by inter-header dependency reductions.
+
+ * tao/Synch_Queued_Message.cpp:
+
+ Included "ace/Message_Block.h". Necessitated by inter-header
+ dependency reductions.
+
+ * tao/TAO.dsp:
+
+ Added new ORB_Core_Auto_Ptr.* files to this project.
+
+ * tao/TAO_Internal.cpp:
+
+ Include "tao/Adapter.h", "tao/ORB_Core.h" and
+ "Dynamic_Service.h". Necessitated by inter-header dependency
+ reductions.
+
+ * tao/Tagged_Components.cpp:
+
+ Cosmetic changes.
+
+ * tao/Thread_Lane_Resources.h:
+ * tao/Thread_Lane_Resources_Manager.h:
+
+ No need to include "tao/corbafwd.h".
+
+ Include "tao/TAO_Export.h" and "ace/CORBA_macros.h".
+ Necessitated by inter-header dependency reductions.
+
+ * tao/Transport.cpp:
+
+ Cosmetic changes.
+
+ * tao/Transport.h:
+
+ No need to include "Transport_Descriptor_Interface.h". A
+ forward declaration is enough.
+
+ (~TAO_Transport):
+
+ Made destructor protected in order to enforce proper memory
+ management through the reference counting mechanism.
+
+ * tao/ValueFactory_Map.cpp:
+
+ Initialize the underlying map with the new
+ "TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE" constant.
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/ValueFactory_Map.h:
+
+ Include "Hash_Map_Manager_T.h" instead of "Hash_Map_Manager.h".
+ The latter includes the former, and the former is the only one
+ that is needed.
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/corba.h:
+
+ Include "tao/varbase.h". The TAO_IDL compiler no longer
+ generates an include directive for that header in the stub
+ headers.
+
+ * tao/corbafwd.cpp:
+
+ Converted global constants in the CORBA namespace to be declared
+ using straight C++ instead of the namespace macro workarounds.
+
+ * tao/corbafwd.h:
+
+ No need to include "ace/CORBA_macros.h" and "tao/varbase.h".
+
+ Removed workaround used for compilers that didn't support C++
+ namespaces. All classes and types that are in the CORBA IDL
+ namespace are now in a true CORBA C++ namespace.
+
+ Removed all "CORBA_" based typedefs. They are no longer
+ needed.
+
+ Moved all non-CORBA namespace related typedefs and constants out
+ this of file. They don't belong there.
+
+ The above changes greatly reduce the size of this file, which
+ has been a bottleneck for compiles.
+
+ * tao/corbafwd.i (default_environment):
+
+ Updated to conform to ACE/TAO coding conventions.
+
+ * tao/iiop_endpoints.h:
+
+ No need to include "tao/Any.h". Include "tao/CDR.h" instead.
+
+ * tao/orbconf.h:
+
+ Added "TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE" global constant to
+ be used as the default size of the ValueFactory map.
+ Previously, the default table size was used which is too large
+ (i.e. 1024).
+
+ * tao/varbase.h (TAO_Base_var):
+
+ Added private copy constructor and assignment operator to
+ improve prevention of invalid widening.
+
+ * tao/PortableServer/Collocated_Object.h:
+
+ No need to include "tao/Servant_Base.h".
+
+ "CORBA_" -> "CORBA::".
+
+ * tao/PortableServer/Direct_Object_Proxy_Impl.cpp
+ (TAO_Direct_Object_Proxy_Impl):
+
+ Removed useless constructor.
+
+ (_get_interface, _getcomponent):
+
+ Fixed emulated exception support.
+
+ * tao/PortableServer/Direct_Object_Proxy_Impl.h:
+ (TAO_Direct_Object_Proxy_Impl):
+
+ Removed useless constructor.
+
+ * tao/PortableServer/Object_Adapter.h:
+
+ No need to include "Key_Adapters.h" and "Servant_Base.h".
+
+ * tao/PortableServer/Operation_Table.h:
+
+ Include "tao/Abstract_Servant_Base.h". Necessitated by
+ inter-header dependency reductions.
+
+ * tao/PortableServer/POA.h:
+
+ Include "tao/PortableInterceptorC.h". Necessitated by
+ inter-header dependency reductions.
+
+ Changed map of POA children from ACE_Hash_Map_Manager to
+ ACE_Hash_Map_Manager_Ex. That save us three template
+ instantiations.
+
+ * tao/PortableServer/ServerInterceptorAdapter.cpp (send_reply):
+ (send_exception, send_other):
+
+ Improved const-correctness.
+
+ * tao/RTCORBA/RT_ORB_Loader.cpp:
+
+ No need to include "tao/ORB_Core.h" and
+ "tao/ORBInitializer_Registry.h".
+
+ "CORBA_" -> "CORBA::".
+
Wed Feb 19 12:52:06 2003 Heather Drury <oci@cs.wustl.edu>
* TAO version 1.3.1 released.
@@ -17,10 +760,10 @@ Mon Feb 17 15:26:32 2003 Balachandran Natarajan <bala@isis-server.isis.vanderb
Mon Feb 17 09:09:54 2003 Heather Drury <drury_h@ociweb.com>
* orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
- * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp: Fixed compile error
- that was happening because the base class signature for
- establish_components() did not match the derived class method
- signature.
+ * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp: Fixed
+ compile error that was happening because the base class
+ signature for establish_components() did not match the derived
+ class method signature.
Sat Feb 15 10:14:08 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
@@ -78,7 +821,7 @@ Fri Feb 14 18:39:01 UTC 2003 Craig Rodrigues <crodrigu@bbn.com>
to print errno, then that is wrong and will crash.
You need to do:
- ACE_DEBUG((LM_DEBUG, "%p", "somestring ));
+ ACE_DEBUG((LM_DEBUG, "%p", "somestring"));
I've changed things to be consistent:
ACE_DEBUG((LM_DEBUG, "errno: %d %m", errno));
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index d6911950150..d1bb3fea82a 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -494,7 +494,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
<< "TAO_Abstract_ServantBase *servant" << be_uidt_nl
<< ")"
<< be_nl;
- *os << ": CORBA_Object (objref, _tao_collocated, servant)";
+ *os << ": Object (objref, _tao_collocated, servant)";
if (this->has_mixed_parentage_)
{
@@ -515,7 +515,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
}
*os << "," << be_nl
- << "CORBA_AbstractBase (objref, _tao_collocated, servant)"
+ << "CORBA::AbstractBase (objref, _tao_collocated, servant)"
<< be_uidt << be_uidt;
}
else
@@ -564,9 +564,15 @@ be_interface::gen_var_defn (char *interface_name)
*ch << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
<< "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+ // Note the private inheritance from TAO_Base_var to emphasize that
+ // a given _var does not satisfy the IS-A relationship. _var
+ // classes are merely IMPLEMENTED-IN-TERMS-OF TAO_Base_var. This
+ // also invalidates assignments like:
+ // Foo_var v;
+ // TAO_Base_var * t = &v;
*ch << "class " << be_global->stub_export_macro ()
<< " " << namebuf
- << " : public TAO_Base_var" << be_nl;
+ << " : private TAO_Base_var" << be_nl;
*ch << "{" << be_nl;
*ch << "public:" << be_idt_nl;
@@ -642,7 +648,7 @@ be_interface::gen_var_defn (char *interface_name)
*ch << "CORBA::Object *" << be_nl;
}
- *ch << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+ *ch << "ACE_ENV_ARG_DECL" << be_uidt_nl
<< ");" << be_uidt_nl;
if (this->is_abstract ())
@@ -664,8 +670,8 @@ be_interface::gen_var_defn (char *interface_name)
*ch << "private:" << be_idt_nl;
*ch << interface_name << "_ptr ptr_;" << be_nl;
*ch << "// Unimplemented - prevents widening assignment." << be_nl;
- *ch << interface_name << "_var (const TAO_Base_var &rhs);" << be_nl;
- *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);"
+ *ch << interface_name << "_var (const TAO_Base_var & rhs);" << be_nl;
+ *ch << interface_name << "_var & operator= (const TAO_Base_var & rhs);"
<< be_uidt_nl;
*ch << "};";
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 7a03815c3ba..f8a4e3fc6c2 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -65,7 +65,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
// Default constructor.
*os << node->name () << "::" << node->local_name ()
<< " (void)" << be_idt_nl;
- *os << ": CORBA_UserException (" << be_idt << be_idt << be_idt_nl
+ *os << ": CORBA::UserException (" << be_idt << be_idt << be_idt_nl
<< "\"" << node->repoID () << "\"," << be_nl
<< "\"" << node->local_name () << "\"" << be_uidt_nl
<< ")" << be_uidt << be_uidt << be_uidt_nl;
@@ -81,7 +81,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
// Copy constructor.
*os << node->name () << "::" << node->local_name () << " (const ::"
<< node->name () << " &_tao_excp)" << be_idt_nl;
- *os << ": CORBA_UserException (" << be_idt << be_idt << be_idt_nl
+ *os << ": CORBA::UserException (" << be_idt << be_idt << be_idt_nl
<< "_tao_excp._rep_id ()," << be_nl
<< "_tao_excp._name ()" << be_uidt_nl
<< ")" << be_uidt << be_uidt << be_uidt_nl;
@@ -115,7 +115,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
*os << node->name () << "::operator= (const ::"
<< node->name () << " &_tao_excp)" << be_nl
<< "{" << be_idt_nl
- << "this->CORBA_UserException::operator= "
+ << "this->UserException::operator= "
<< "(_tao_excp);";
// Assign each individual member.
@@ -296,7 +296,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
-1);
}
- *os << " : CORBA_UserException ("
+ *os << " : CORBA::UserException ("
<< be_idt << be_idt << be_idt << be_idt_nl
<< "\"" << node->repoID () << "\"," << be_nl
<< "\"" << node->local_name () << "\"" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
index 24c03a490fe..574cee004b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
@@ -107,7 +107,7 @@ be_visitor_amh_interface_ch::visit_interface (be_interface *node)
{
// We do not inherit from anybody, hence we do so from the base
// CORBA::Object class.
- *os << "public virtual CORBA_Object" << be_uidt_nl;
+ *os << "public virtual CORBA::Object" << be_uidt_nl;
}
// Generate the body.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index 9a83fb4d255..ee37390f8e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -75,13 +75,13 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
<< "ACE_INLINE" << be_nl
<< node->name () << "::" << node->local_name ()
<< " (void)" << be_idt_nl
- << ": CORBA_AbstractBase ()" << be_uidt_nl
+ << ": CORBA::AbstractBase ()" << be_uidt_nl
<< "{}" << be_nl << be_nl;
*os << "ACE_INLINE" << be_nl
<< node->name () << "::" << node->local_name ()
<< " (const " << node->local_name () << " &rhs)" << be_idt_nl
- << ": CORBA_AbstractBase (rhs)" << be_uidt_nl
+ << ": CORBA::AbstractBase (rhs)" << be_uidt_nl
<< "{}" << be_nl << be_nl;
*os << "ACE_INLINE" << be_nl
@@ -91,7 +91,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
<< "CORBA::Boolean _tao_collocated," << be_nl
<< "TAO_Abstract_ServantBase *servant" << be_uidt_nl
<< ")" << be_nl
- << ": CORBA_AbstractBase (objref, _tao_collocated, servant)"
+ << ": CORBA::AbstractBase (objref, _tao_collocated, servant)"
<< be_uidt_nl
<< "{}";
}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 47d301a24b5..845450e071c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -316,7 +316,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
*os << "void" << be_nl
<< node->name () << "::_add_ref (void)" << be_nl
<< "{" << be_idt_nl
- << "this->CORBA_Object::_add_ref ();" << be_uidt_nl
+ << "this->Object::_add_ref ();" << be_uidt_nl
<< "}" << be_nl << be_nl;
}
@@ -538,7 +538,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
}
else
{
- *os << "return this->CORBA_Object::_is_a (" << be_idt << be_idt_nl
+ *os << "return this->Object::_is_a (" << be_idt << be_idt_nl
<< "value" << be_nl
<< "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
<< ");" << be_uidt << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 0cc52dff024..3f11c294b27 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -251,7 +251,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
*os << "{" << be_idt_nl;
*os << full_skel_name << " *_tao_impl = ("
<< full_skel_name << " *) _tao_servant;" << be_nl
- << "CORBA_InterfaceDef_ptr _tao_retval = 0;" << be_nl
+ << "CORBA::InterfaceDef_ptr _tao_retval = 0;" << be_nl
<< "CORBA::Boolean _tao_result = 0;" << be_nl << be_nl;
*os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl
<< "ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ("
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 2da80088d2c..eecf9442577 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -537,7 +537,7 @@ be_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node,
// the connection retry loop must be restarted so do not rethrow the
// caught exception.
*os << be_nl
- << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
+ << "const PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
<< "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
<< "ACE_TRY_CHECK;" << be_nl;
@@ -577,7 +577,7 @@ be_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node,
// support code, so we must explicitly check the status in the
// ClientRequestInfo object.
*os << be_nl
- << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
+ << "const PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
<< "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl;
if (this->gen_check_exception (bt) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index 3d15b3b810d..e8156dd552f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -53,7 +53,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH:
case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH:
case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XS:
- *os << "CORBA_Object *_collocated_tao_target_";
+ *os << "CORBA::Object *_collocated_tao_target_";
if (node->argument_count () > 0)
{
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index aa8fdb67a2f..8d83a268db7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -778,9 +778,10 @@ be_visitor_operation::gen_marshal_and_invoke (
*os << be_nl
<< "if (_invoke_status == TAO_INVOKE_RESTART)" << be_idt_nl
<< "{" << be_idt_nl
- << "_tao_call.restart_flag (1);" << be_nl
- << "continue;" << be_uidt_nl
- << "}" << be_uidt_nl;
+ << "_tao_call.restart_flag (1);" << be_uidt_nl
+ << "}" << be_uidt_nl
+ << "else" << be_idt_nl
+ << "{" << be_idt_nl;
*os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl;
@@ -923,8 +924,10 @@ be_visitor_operation::gen_marshal_and_invoke (
// one way operation since the sync scope policy may actually allow
// things such as LOCATION_FORWARD replies to be propagated back to
// the client (e.g. SYNC_WITH_TARGET).
+
*os << "else if (_invoke_status == TAO_INVOKE_RESTART)" << be_idt_nl
<< "{" << be_idt_nl
+ << "_tao_call.restart_flag (1);" << be_nl
<< "TAO_INTERCEPTOR (" << be_idt << be_idt_nl
<< "_tao_ri.reply_status (_invoke_status);" << be_nl
<< "_tao_vfr.receive_other (" << be_idt << be_idt_nl
@@ -932,10 +935,10 @@ be_visitor_operation::gen_marshal_and_invoke (
<< "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
<< ");" << be_uidt_nl
<< "ACE_TRY_CHECK;" << be_uidt_nl
- << ")" << be_uidt_nl
- << be_nl
- << "continue;" << be_uidt_nl
- << "}" << be_uidt;
+ << ")" << be_uidt << be_uidt_nl
+ << "}" << be_uidt_nl
+ << "else" << be_idt_nl
+ << "{" << be_idt;
// If we reach here, we are ready to proceed.
// the code below this is for twoway operations only.
@@ -1139,8 +1142,12 @@ be_visitor_operation::gen_marshal_and_invoke (
}
*os << "ACE_TRY_CHECK;"
- << be_uidt_nl
- << "}" << be_uidt_nl;
+ << be_uidt_nl;
+
+ *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl;
+
+ *os << "}" << be_uidt << be_uidt_nl // End inner "else" block.
+ << "}" << be_uidt << be_uidt_nl; // End outer "else" block.
// Note that we do NOT catch the PortableInterceptor::ForwardRequest
// exception here. It is caught in the
@@ -1148,7 +1155,9 @@ be_visitor_operation::gen_marshal_and_invoke (
// prevent applications from being able to throw the exception in an
// effort to get an easy (but illegal) way to forward a request.
- *os << "ACE_CATCHANY" << be_idt_nl
+ *os << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
+ << "}" << be_uidt_nl
+ << "ACE_CATCHANY" << be_idt_nl
<< "{" << be_idt_nl;
// Update the exception field of the ClientRequestInfo.
@@ -1165,7 +1174,7 @@ be_visitor_operation::gen_marshal_and_invoke (
// the connection retry loop must be restarted so do not rethrow the
// caught exception.
*os << be_nl
- << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
+ << "const PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
<< "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
<< "ACE_TRY_CHECK;" << be_nl;
@@ -1208,7 +1217,7 @@ be_visitor_operation::gen_marshal_and_invoke (
// the connection retry loop must be restarted so do not throw the
// CORBA::UNKNOWN exception to convert the unhandled C++ exception.
*os << be_nl
- << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
+ << "const PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
<< "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
<< "ACE_TRY_CHECK;" << be_nl;
@@ -1248,7 +1257,7 @@ be_visitor_operation::gen_marshal_and_invoke (
// support code, so we must explicitly check the status in the
// ClientRequestInfo object.
*os << be_nl
- << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
+ << "const PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
<< "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl;
if (this->gen_check_exception (bt) == -1)
@@ -1261,17 +1270,16 @@ be_visitor_operation::gen_marshal_and_invoke (
}
*os << be_nl
- << "if (_tao_status == PortableInterceptor::LOCATION_FORWARD" << be_nl
- << " || _tao_status == PortableInterceptor::TRANSPORT_RETRY)"
- << be_idt_nl
- << "{" << be_idt_nl
- << "continue;" << be_uidt_nl
- << "}" << be_uidt_nl;
-
+ << "if (_tao_status != PortableInterceptor::LOCATION_FORWARD" << be_nl
+ << " && _tao_status != PortableInterceptor::TRANSPORT_RETRY)"
+ << be_idt_nl;
+ // Continue to below break statement."
*os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl;
- *os << be_nl << "break;" << be_uidt_nl
- << "}" << be_uidt;
+ *os << be_nl
+ << "if (_invoke_status != TAO_INVOKE_RESTART)" << be_idt_nl
+ << "break;" << be_uidt << be_uidt_nl
+ << "}" << be_uidt << be_uidt;
return 0;
}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index cc7e3f561ef..c062e2825ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -82,7 +82,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
<< ")" << be_uidt_nl
<< "{" << be_idt_nl;
*os << "return" << be_idt_nl
- << "CORBA_ValueBase::_tao_marshal (" << be_idt << be_idt_nl
+ << "CORBA::ValueBase::_tao_marshal (" << be_idt << be_idt_nl
<< "strm," << be_nl
<< "ACE_const_cast (" << be_idt << be_idt_nl
<< node->full_name () << " *," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 6248fd149a7..0b97eda4a5f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -1008,12 +1008,12 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node)
*os << "class " << be_global->stub_export_macro ()
<< " " << node->local_name ()
- << "_init : public CORBA_ValueFactoryBase" << be_nl;
+ << "_init : public CORBA::ValueFactoryBase" << be_nl;
// Generate the body.
*os << "{" << be_nl
<< "public:" << be_idt_nl
- << "virtual ~" << node->local_name () << "_init ();" << be_nl;
+ << "virtual ~" << node->local_name () << "_init (void);" << be_nl;
*os << "virtual const char* tao_repository_id (void);\n" << be_nl;
*os << "// create () goes here" << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 34912629afb..636afaeda45 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -151,7 +151,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
** This is where we diverge for an ExceptionHolder ValueType.
** This is how we proceed:
** 1) Identify it is an AMH_ExceptionHolder class.
- ** 2) Inherit from CORBA_DefaultValueBaseRef i.e. provide a CONCRETE
+ ** 2) Inherit from CORBA::DefaultValueBaseRef i.e. provide a CONCRETE
** implementation for this ValueType! This is because the alternative
** design of deriving a concrete-exception-holder class that the IDL
** compiler again has to generate is superflous, unnecessary, more
@@ -199,7 +199,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
*os << "," << be_nl;
}
- *os << "public virtual CORBA_DefaultValueRefCountBase";
+ *os << "public virtual CORBA::DefaultValueRefCountBase";
}
if (node->node_type () == AST_Decl::NT_eventtype)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 4d057ca4d21..6565d3f6046 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -73,7 +73,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
//@@ If I'm generating concrete class I need a RefCounter.
os << "class " << be_global->stub_export_macro ()
<< " " << node->local_name ()
- << "_init : public virtual CORBA_ValueFactoryBase" << be_nl;
+ << "_init : public virtual CORBA::ValueFactoryBase" << be_nl;
// Generate the body.
os << "{" << be_nl
@@ -86,7 +86,8 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
}
// Virtual destructor.
- os << "virtual ~" << node->local_name () << "_init (void);";
+ os << "virtual ~" << node->local_name () << "_init (void);"
+ << be_nl << be_nl;
if (this->visit_valuetype_scope (node) == -1)
@@ -101,7 +102,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
// Generate _downcast method.
os << be_nl << be_nl
<< "static " << node->local_name () << "_init* "
- << "_downcast (CORBA_ValueFactoryBase* );";
+ << "_downcast (CORBA::ValueFactoryBase* );";
if (factory_style == FS_CONCRETE_FACTORY)
{
@@ -132,7 +133,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node)
// Protected constructor.
os << be_uidt_nl << be_nl
<< "protected:" << be_idt_nl;
- os << node->local_name () << "_init ();";
+ os << node->local_name () << "_init (void);";
}
os << be_uidt_nl << "};";
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index 7086baf33b2..121cf919a8b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -106,11 +106,11 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
{
// generate create_for_unmarshal()
*os << be_nl << be_nl
- << "CORBA_ValueBase *" << be_nl
+ << "CORBA::ValueBase *" << be_nl
<< fname << "::create_for_unmarshal" << " "
<< "(void)" << be_nl
<< "{" << be_idt_nl
- << "CORBA_ValueBase *ret_val = 0;" << be_nl
+ << "CORBA::ValueBase *ret_val = 0;" << be_nl
<< "ACE_NEW_RETURN (" << be_idt << be_idt_nl
<< "ret_val," << be_nl
<< "OBV_" << node->full_name () << "," << be_nl
@@ -125,7 +125,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node)
<< "CORBA::AbstractBase_ptr" << be_nl
<< fname << "::create_for_unmarshal_abstract (void)" << be_nl
<< "{" << be_idt_nl
- << "CORBA_AbstractBase *ret_val = 0;" << be_nl
+ << "CORBA::AbstractBase *ret_val = 0;" << be_nl
<< "ACE_NEW_RETURN (" << be_idt << be_idt_nl
<< "ret_val," << be_nl
<< "OBV_" << node->full_name () << "," << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index b0d443f93df..00ef4a5d46f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -128,7 +128,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
*os << "," << be_nl;
// dump the scoped name.
- *os << " public virtual CORBA_DefaultValueRefCountBase";
+ *os << " public virtual CORBA::DefaultValueRefCountBase";
}
*os << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index a3b1702b7eb..e24df613acd 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -104,7 +104,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
<< node->full_obv_skel_name ()
<< "::_add_ref (void)" << be_nl
<< "{" << be_idt_nl
- << "this->CORBA_DefaultValueRefCountBase::_add_ref ();"
+ << "this->DefaultValueRefCountBase::_add_ref ();"
<< be_uidt_nl
<< "}" << be_nl;
@@ -112,7 +112,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
<< node->full_obv_skel_name ()
<< "::_remove_ref (void)" << be_nl
<< "{" << be_idt_nl
- << "this->CORBA_DefaultValueRefCountBase::_remove_ref ();"
+ << "this->DefaultValueRefCountBase::_remove_ref ();"
<< be_uidt_nl
<< "}";
}
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 501348614ff..a0fa343064f 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
//=============================================================================
/**
@@ -10,7 +11,6 @@
* and make it possible to keep the reference to the servant in
* the CORBA::Object class.
*
- *
* @author Angelo Corsaro <corsaro@cs.wustl.edu>
*/
//=============================================================================
@@ -19,15 +19,27 @@
#ifndef TAO_ABSTRACT_SERVANT_BASE_H_
#define TAO_ABSTRACT_SERVANT_BASE_H_
-// -- ACE Include --
#include "ace/pre.h"
+
#include "tao/corbafwd.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "ace/CORBA_macros.h"
+
class TAO_ServerRequest;
+class TAO_Stub;
+
+typedef void (*TAO_Skeleton)(
+ TAO_ServerRequest &,
+ void *,
+ void *
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
+ , CORBA::Environment &
+#endif
+ );
class TAO_Export TAO_Abstract_ServantBase
{
@@ -40,18 +52,24 @@ public:
ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
/// Default <_non_existent>: always returns false.
- virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+ virtual CORBA::Boolean _non_existent (
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
/// Query the Interface Repository.
- virtual CORBA_InterfaceDef_ptr _get_interface (
+ virtual CORBA::InterfaceDef_ptr _get_interface (
ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
) = 0;
/// Default <_get_component>: always returns nil.
- virtual CORBA::Object_ptr _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+ virtual CORBA::Object_ptr _get_component (
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
//@{
- /// @name Reference counting hooks: no-ops by default.
+ /**
+ * @name Reference Counting Hooks
+ *
+ * Reference counting hooks are no-ops by default.
+ */
virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
//@}
@@ -63,6 +81,7 @@ public:
virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0;
protected:
+
/// Default constructor, only derived classes can be created.
TAO_Abstract_ServantBase (void);
@@ -99,7 +118,10 @@ protected:
/// Get this interface's repository id (TAO specific).
virtual const char *_interface_repository_id (void) const = 0;
+
};
+
#include "ace/post.h"
+
#endif /* TAO_ABSTRACT_SERVANT_BASE_H_ */
diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h
index 594b1e909de..f8a172cd560 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -32,6 +32,7 @@ class TAO_MProfile;
#endif /* _MSC_VER */
class TAO_Acceptor;
+class TAO_ObjectKey;
/**
* @class TAO_Acceptor_Filter
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 11e0a966b29..2307b027175 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -31,6 +31,7 @@
#include "tao/Connector_Registry.h"
#include "tao/Transport_Cache_Manager.h"
#include "tao/Thread_Lane_Resources.h"
+#include "tao/Transport.h"
#include "ace/Object_Manager.h"
@@ -38,7 +39,9 @@
#include "tao/Acceptor_Impl.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(tao, Acceptor_Impl, "$Id$")
+ACE_RCSID (tao,
+ Acceptor_Impl,
+ "$Id$")
////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index ec895d3fe36..525a06e3251 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -6,7 +6,8 @@
*
* $Id$
*
- * @author Carlos O'Ryan <coryan@cs.wustl.edu>Ossama Othman <othman@cs.wustl.edu>
+ * @author Carlos O'Ryan <coryan@cs.wustl.edu>
+ * @author Ossama Othman <othman@cs.wustl.edu>
*/
//=============================================================================
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index b25c45d95aa..dd3e5057303 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -34,6 +34,7 @@ class TAO_ORB_Core;
class TAO_Stub;
class TAO_MProfile;
class TAO_ServerRequest;
+class TAO_ObjectKey;
class TAO_Export TAO_Adapter
{
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index 34a97100b32..2685de7d048 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -1,4 +1,4 @@
-// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -25,7 +25,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/Asynch_Reply_Dispatcher_Base.h"
+
+class TAO_Asynch_Reply_Dispatcher_Base;
/**
* @class TAO_GIOP_Asynch_Invocation
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index 86dab3697b9..b12a57221d6 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -2,6 +2,7 @@
#include "debug.h"
#include "ace/Malloc_T.h"
#include "ace/Log_Msg.h"
+#include "ace/Message_Block.h"
ACE_RCSID (tao,
diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
index a102188901e..12732025655 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -14,7 +14,7 @@
#define TAO_ASYNCH_REPLY_DISPATCHER_BASE_H
#include "ace/pre.h"
-#include "tao/orbconf.h"
+#include "tao/TAO_Export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index f6b8979a2fe..33226d92eb7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -1,12 +1,13 @@
-/* -*- C++ -*- */
-
#include "BiDirGIOP.h"
#include "BiDir_ORBInitializer.h"
#include "BiDirPolicy_Validator.h"
#include "tao/ORB_Core.h"
-ACE_RCSID(BiDir_GIOP, BiDirGIOP, "$Id$")
+ACE_RCSID (BiDir_GIOP,
+ BiDirGIOP,
+ "$Id$")
+
// Set the flag to zero to start with
int TAO_BiDirGIOP_Loader::validator_loaded_ = 0;
@@ -40,7 +41,7 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
ACE_NEW_THROW_EX (tmp_orb_initializer,
TAO_BiDir_ORBInitializer,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -48,8 +49,9 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
bidir_orb_initializer = tmp_orb_initializer;
- PortableInterceptor::register_orb_initializer (bidir_orb_initializer.in ()
- ACE_ENV_ARG_PARAMETER);
+ PortableInterceptor::register_orb_initializer (
+ bidir_orb_initializer.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
TAO_ORB_Core *orb_core =
@@ -58,7 +60,7 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
ACE_NEW_THROW_EX (this->validator_,
TAO_BiDirPolicy_Validator (*orb_core),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index d216a1f2398..0a5699f7a85 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -1,14 +1,11 @@
-// -*- C++ -*-
-//
-// $Id$
-
#include "BiDir_PolicyFactory.h"
#include "BiDirGIOP.h"
#include "BiDir_Policy_i.h"
-ACE_RCSID (BiDir_GIOP, BiDir_PolicyFactory, "$Id$")
-
+ACE_RCSID (BiDir_GIOP,
+ BiDir_PolicyFactory,
+ "$Id$")
CORBA::Policy_ptr
@@ -31,7 +28,7 @@ TAO_BiDir_PolicyFactory::create_policy (
ACE_NEW_THROW_EX (policy,
TAO_BidirectionalPolicy (val),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 6052f19ba43..41a7bc5bc69 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -41,8 +41,8 @@
// Default constructor.
CORBA::Bounds::Bounds (void)
- : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0",
- "Bounds")
+ : CORBA::UserException ("IDL:omg.org/CORBA/Bounds:1.0",
+ "Bounds")
{
}
@@ -53,8 +53,8 @@ CORBA::Bounds::~Bounds (void)
// Copy constructor.
CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id (),
- _tao_excp._name ())
+ : CORBA::UserException (_tao_excp._rep_id (),
+ _tao_excp._name ())
{
}
@@ -62,7 +62,7 @@ CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
CORBA::Bounds&
CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index a08222e531f..d0c0fb66cc0 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -14,7 +14,7 @@
//
// The implementation knows that native data formats are conformant
// with OMG-IDL's (and hence CDR's) size requirements, and relies on
-// the fact that (for example) CORBA_Long is always four bytes long
+// the fact that (for example) CORBA::Long is always four bytes long
// even if the environment's "int" is a different size.
//
// char, octet 8 bits (1 byte)
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index f216bc52d70..65fb354eafe 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -32,8 +32,9 @@
* concurrent access by their owning thread.
*
*
- * @author Copyright 1994-1995 by Sun Microsystems
- * @author Inc. Many enhancements added by Aniruddha Gokhale and Carlos O'Ryan.
+ * @author Copyright 1994-1995 by Sun Microsystems Inc.
+ * @author Aniruddha Gokhale
+ * @author Carlos O'Ryan
*/
//=============================================================================
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index 7118e6e4aa0..d452631980a 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -57,7 +57,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
ACE_NEW_THROW_EX (octet_seq,
CORBA::OctetSeq,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -123,10 +123,10 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
ACE_NEW_THROW_EX (any,
CORBA::Any,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
- TAO_DEFAULT_MINOR_CODE,
- ENOMEM),
- CORBA::COMPLETED_NO));
+ CORBA::SystemException::_tao_minor_code (
+ TAO_DEFAULT_MINOR_CODE,
+ ENOMEM),
+ CORBA::COMPLETED_NO));
ACE_CHECK_RETURN (0);
CORBA::Any_var safe_any = any;
@@ -181,7 +181,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
ACE_NEW_THROW_EX (octet_seq,
CORBA::OctetSeq,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -306,10 +306,10 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
ACE_NEW_THROW_EX (any,
CORBA::Any,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
- TAO_DEFAULT_MINOR_CODE,
- ENOMEM),
- CORBA::COMPLETED_NO));
+ CORBA::SystemException::_tao_minor_code (
+ TAO_DEFAULT_MINOR_CODE,
+ ENOMEM),
+ CORBA::COMPLETED_NO));
ACE_CHECK_RETURN (0);
CORBA::Any_var safe_any = any;
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 68e4e23f8b6..ae8759d14ca 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -171,8 +171,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr,
iiop_prefix,
sizeof (iiop_prefix) - 1) == 0
&& addr.find (':') == ACE_CString::npos)
- ACE_OS::strcat (end_point.inout (),
- def_port);
+ ACE_OS::strcat (end_point.inout (), def_port);
// Example:
// The End_point will now be of the form
@@ -271,7 +270,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
if (retv != 0)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -279,7 +278,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
TAO_MProfile *jth_mprofile_ptr = &jth_mprofile;
- /// Add this profile to the main mprofile.
+ // Add this profile to the main mprofile.
int result = mprofile.add_profiles (jth_mprofile_ptr);
if (result == -1)
@@ -307,15 +306,14 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
if (!CORBA::is_nil (obj.in ()))
{
- /// All is well, so release the stub object from its
- /// auto_ptr.
+ // All is well, so release the stub object from its auto_ptr.
(void) safe_data.release ();
- /// Return the object reference to the application.
+ // Return the object reference to the application.
return obj._retn ();
}
- /// Shouldnt come here: if so, return nil reference.
+ // Shouldn't come here: if so, return nil reference.
return CORBA::Object::_nil ();
}
@@ -411,7 +409,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- /// MProfile which consists of the profiles for each endpoint.
+ // MProfile which consists of the profiles for each endpoint.
TAO_MProfile mprofile;
// Skip the prefix. We know it is there because this method is only
diff --git a/TAO/tao/ClientInterceptorAdapter.cpp b/TAO/tao/ClientInterceptorAdapter.cpp
index 4562b3b99ef..b10c589d29e 100644
--- a/TAO/tao/ClientInterceptorAdapter.cpp
+++ b/TAO/tao/ClientInterceptorAdapter.cpp
@@ -74,7 +74,7 @@ receive_reply (TAO_ClientRequestInfo_i *ri
TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
// Unwind the stack.
- size_t len = this->stack_size_;
+ const size_t len = this->stack_size_;
for (size_t i = 0; i < len; ++i)
{
// Pop the interceptor off of the flow stack before it is
@@ -111,7 +111,7 @@ receive_exception (TAO_ClientRequestInfo_i *ri
TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
// Unwind the flow stack.
- size_t len = this->stack_size_;
+ const size_t len = this->stack_size_;
for (size_t i = 0; i < len; ++i)
{
// Pop the interceptor off of the flow stack before it is
@@ -180,7 +180,7 @@ receive_other (TAO_ClientRequestInfo_i *ri
TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
// Unwind the stack.
- size_t len = this->stack_size_;
+ const size_t len = this->stack_size_;
for (size_t i = 0; i < len; ++i)
{
// Pop the interceptor off of the flow stack before it is
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index c1147b8a1de..e1e2e2d6084 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
#include "ClientRequestInfo_i.h"
#include "Invocation.h"
#include "Stub.h"
@@ -204,7 +202,7 @@ TAO_ClientRequestInfo_i::get_effective_component (
IOP::MultipleComponentProfile &components = ecs.components ();
- CORBA::ULong len = components.length ();
+ const CORBA::ULong len = components.length ();
for (CORBA::ULong i = 0; i < len; ++i)
{
if (components[i].tag == id)
@@ -252,7 +250,7 @@ TAO_ClientRequestInfo_i::get_effective_components (
IOP::TaggedComponentSeq *tagged_components = 0;
IOP::TaggedComponentSeq_var safe_tagged_components;
- CORBA::ULong len = components.length ();
+ const CORBA::ULong len = components.length ();
for (CORBA::ULong i = 0; i < len; ++i)
{
if (components[i].tag == id)
@@ -273,7 +271,7 @@ TAO_ClientRequestInfo_i::get_effective_components (
safe_tagged_components = tagged_components;
}
- CORBA::ULong old_len = safe_tagged_components->length ();
+ const CORBA::ULong old_len = safe_tagged_components->length ();
safe_tagged_components->length (old_len + 1);
safe_tagged_components[old_len] = components[i]; // Deep copy
@@ -295,7 +293,7 @@ TAO_ClientRequestInfo_i::get_effective_components (
CORBA::Policy_ptr
TAO_ClientRequestInfo_i::get_request_policy (CORBA::PolicyType type
- ACE_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// @@ Do we need to look anywhere else for the request policies?
@@ -501,10 +499,12 @@ TAO_ClientRequestInfo_i::reply_status (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ == -1)
- // A reply hasn't been received yet.
- ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
- CORBA::COMPLETED_NO),
- -1);
+ {
+ // A reply hasn't been received yet.
+ ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+ CORBA::COMPLETED_NO),
+ -1);
+ }
return this->reply_status_;
}
@@ -514,9 +514,11 @@ TAO_ClientRequestInfo_i::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
- ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
- CORBA::COMPLETED_NO),
- CORBA::Object::_nil ());
+ {
+ ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14,
+ CORBA::COMPLETED_NO),
+ CORBA::Object::_nil ());
+ }
// TAO_GIOP_Invocation::forward_reference() already duplicates the
// reference before returning it so there is no need to duplicate it
@@ -546,7 +548,7 @@ TAO_ClientRequestInfo_i::get_request_service_context (
return this->get_service_context_i (service_context_list,
id
- ACE_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
@@ -562,7 +564,7 @@ TAO_ClientRequestInfo_i::get_reply_service_context (
return this->get_service_context_i (service_context_list,
id
- ACE_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h
index 235ac9928d7..1c82ffdc3c6 100644
--- a/TAO/tao/ClientRequestInfo_i.h
+++ b/TAO/tao/ClientRequestInfo_i.h
@@ -29,10 +29,11 @@
#include "PortableInterceptorC.h"
#include "StringSeqC.h"
-#include "Service_Context.h"
#include "PICurrent.h"
+
class TAO_GIOP_Invocation;
+class TAO_Service_Context;
/**
* @class TAO_ClientRequestInfo_i
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
index ce04b756e15..346f2127e55 100644
--- a/TAO/tao/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory.cpp
@@ -40,7 +40,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
{
// There is no such thing as a "0.x" CDR encapsulation.
ACE_THROW_RETURN (CORBA::BAD_PARAM (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
@@ -52,7 +52,7 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc
enc.minor_version,
this->orb_core_),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_MAYBE));
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 94b9c251c55..4c4d2aaaa50 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -153,7 +153,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
if (!ior)
// Failure: Null IOR string pointer
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
@@ -180,7 +180,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
else
// Failure: Null pointer to connector in connector registry.
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
@@ -190,7 +190,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
// Failure: None of the connectors were able to parse the URL style
// IOR into an MProfile.
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_CONNECTOR_REGISTRY_NO_USABLE_PROTOCOL,
0),
CORBA::COMPLETED_NO),
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index ff7c6807510..85b0a40de2b 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -17,7 +17,7 @@
//
// 1. Patch this pidl file to (a) remove the CORBA module bringing
// the Current interface to the global scope; and (b) rename the
-// Current interface to CORBA_Current.
+// Current interface to CORBA::Current.
//
// Apply patches using the following commands:
//
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 3dd8d974f3d..4634f9759b7 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -45,7 +45,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
{
ACE_THROW_RETURN
(CORBA::INV_OBJREF
- (CORBA_SystemException::_tao_minor_code (
+ (CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 58721933e8f..b6c261b2322 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
// $Id$
// =================================================================
//
@@ -24,7 +23,11 @@
#include "ace/Auto_Ptr.h"
-ACE_RCSID(DynamicAny, DynAnyFactory, "$Id$")
+
+ACE_RCSID (DynamicAny,
+ DynAnyFactory,
+ "$Id$")
+
// Constructor from typecode
TAO_DynAnyFactory::TAO_DynAnyFactory (void)
@@ -34,7 +37,7 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
// Utility function called by all the DynAny classes
// to extract the TCKind of possibly aliased types.
CORBA::TCKind
-TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
+TAO_DynAnyFactory::unalias (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -42,7 +45,8 @@ TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
while (tck == CORBA::tk_alias)
{
- CORBA_TypeCode_var temp = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var temp =
+ tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::tk_null);
tck = TAO_DynAnyFactory::unalias (temp.in ()
@@ -55,10 +59,10 @@ TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
// Same as above, but returns the type code.
CORBA::TypeCode_ptr
-TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc
+TAO_DynAnyFactory::strip_alias (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
- CORBA_TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
+ CORBA::TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
@@ -101,7 +105,7 @@ TAO_DynAnyFactory::create_dyn_any_from_type_code (
}
DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
+TAO_DynAnyFactory::make_dyn_any (const CORBA::Any &any
ACE_ENV_ARG_DECL)
{
CORBA::TypeCode_var tc = any.type ();
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 7e414a9d273..bb72decaa63 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -44,17 +44,17 @@ public:
TAO_DynAnyFactory (void);
// Constructor.
- static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc
+ static CORBA::TCKind unalias (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL);
// Obtain the kind of object, after all aliasing has been removed.
- static CORBA_TypeCode_ptr strip_alias (CORBA_TypeCode_ptr tc
- ACE_ENV_ARG_DECL);
+ static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc
+ ACE_ENV_ARG_DECL);
// Same as above, but returns type code instead of TCKind. Caller
// must release the return value.
static DynamicAny::DynAny_ptr
- make_dyn_any (const CORBA_Any &any
+ make_dyn_any (const CORBA::Any &any
ACE_ENV_ARG_DECL);
// Create the correct type of DynAny object for <any>.
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index dd921bcefcc..ffbad848f3d 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,17 +1,16 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynAny_i.h"
#include "DynAnyFactory.h"
-ACE_RCSID(DynamicAny, DynAny_i, "$Id$")
-// Constructor from typecode
+ACE_RCSID (DynamicAny,
+ DynAny_i,
+ "$Id$")
+
+
TAO_DynAny_i::TAO_DynAny_i (void)
{
}
-// Destructor
TAO_DynAny_i::~TAO_DynAny_i (void)
{
}
@@ -61,7 +60,7 @@ TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
case CORBA::tk_null:
break;
case CORBA::tk_void:
- this->any_ = CORBA_Any (CORBA::_tc_void);
+ this->any_ = CORBA::Any (CORBA::_tc_void);
break;
case CORBA::tk_short:
this->any_ <<= ACE_static_cast (CORBA::Short, 0);
@@ -148,7 +147,7 @@ TAO_DynAny_i::init_common (void)
}
void
-TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
+TAO_DynAny_i::init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
this->check_typecode (tc
@@ -165,7 +164,7 @@ TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
}
void
-TAO_DynAny_i::init (const CORBA_Any& any
+TAO_DynAny_i::init (const CORBA::Any& any
ACE_ENV_ARG_DECL)
{
this->type_ = any.type ();
@@ -219,7 +218,7 @@ TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type)
// ****************************************************************
void
-TAO_DynAny_i::from_any (const CORBA_Any &any
+TAO_DynAny_i::from_any (const CORBA::Any &any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -263,7 +262,7 @@ TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
0);
}
- CORBA_Any_ptr retval;
+ CORBA::Any_ptr retval;
ACE_NEW_THROW_EX (retval,
CORBA::Any (this->any_),
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 7f637242846..c304536d27d 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -52,11 +52,11 @@ public:
~TAO_DynAny_i (void);
/// Initialize using just a TypeCode
- void init (CORBA_TypeCode_ptr tc
+ void init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL);
/// Initialize using an Any.
- void init (const CORBA_Any& any
+ void init (const CORBA::Any& any
ACE_ENV_ARG_DECL);
// = LocalObject methods.
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 6802ad3f5ac..f69fc0d5cf1 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynArray_i.h"
#include "DynAnyFactory.h"
#include "tao/Marshal.h"
-ACE_RCSID(DynamicAny, DynArray_i, "$Id$")
-// Constructor and destructor,
+ACE_RCSID (DynamicAny,
+ DynArray_i,
+ "$Id$")
+
TAO_DynArray_i::TAO_DynArray_i (void)
{
@@ -29,7 +28,7 @@ TAO_DynArray_i::init_common (void)
}
void
-TAO_DynArray_i::init (const CORBA_Any & any
+TAO_DynArray_i::init (const CORBA::Any & any
ACE_ENV_ARG_DECL)
{
CORBA::TypeCode_var tc = any.type ();
@@ -66,10 +65,10 @@ TAO_DynArray_i::init (const CORBA_Any & any
for (CORBA::ULong i = 0; i < numfields; i++)
{
// This Any constructor is a TAO extension.
- CORBA_Any field_any (field_tc.in (),
- 0,
- cdr.byte_order (),
- cdr.start ());
+ CORBA::Any field_any (field_tc.in (),
+ 0,
+ cdr.byte_order (),
+ cdr.start ());
// This recursive step will call the correct constructor
// based on the type of field_any.
@@ -87,7 +86,7 @@ TAO_DynArray_i::init (const CORBA_Any & any
}
void
-TAO_DynArray_i::init (CORBA_TypeCode_ptr tc
+TAO_DynArray_i::init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -126,24 +125,24 @@ CORBA::TypeCode_ptr
TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
{
CORBA::TypeCode_var element_type =
- CORBA_TypeCode::_duplicate (this->type_.in ());
+ CORBA::TypeCode::_duplicate (this->type_.in ());
// Strip away aliases (if any) on top of the outer type
CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
while (kind != CORBA::tk_array)
{
element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
}
// Return the content type.
- CORBA_TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ CORBA::TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
return retval;
}
@@ -390,7 +389,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
// ****************************************************************
void
-TAO_DynArray_i::from_any (const CORBA_Any& any
+TAO_DynArray_i::from_any (const CORBA::Any& any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -431,7 +430,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
for (CORBA::ULong i = 0; i < arg_length; ++i)
{
// This Any constructor is a TAO extension.
- CORBA_Any field_any (field_tc.in (),
+ CORBA::Any field_any (field_tc.in (),
0,
cdr.byte_order (),
cdr.start ());
@@ -471,7 +470,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
0);
}
- CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
TAO_OutputCDR out_cdr;
@@ -498,12 +497,12 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
TAO_InputCDR in_cdr (out_cdr);
- CORBA_Any_ptr retval = 0;
+ CORBA::Any_ptr retval = 0;
ACE_NEW_THROW_EX (retval,
- CORBA_Any (this->type_.in (),
- 0,
- in_cdr.byte_order (),
- in_cdr.start ()),
+ CORBA::Any (this->type_.in (),
+ 0,
+ in_cdr.byte_order (),
+ in_cdr.start ()),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 083320ad336..f700af3887a 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -52,11 +52,11 @@ public:
~TAO_DynArray_i (void);
// Destructor.
- void init (CORBA_TypeCode_ptr tc
+ void init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL);
// Initialize using just a TypeCode.
- void init (const CORBA_Any& any
+ void init (const CORBA::Any& any
ACE_ENV_ARG_DECL);
// Initialize using an Any.
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index d240779b1d1..cf7f985a802 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,6 +1,3 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynCommon.h"
#include "DynAnyFactory.h"
#include "DynAny_i.h"
@@ -10,14 +7,16 @@
#include "DynStruct_i.h"
#include "DynUnion_i.h"
-ACE_RCSID(DynamicAny, DynCommon, "$Id$")
-// Constructor.
+ACE_RCSID (DynamicAny,
+ DynCommon,
+ "$Id$")
+
+
TAO_DynCommon::TAO_DynCommon (void)
{
}
-// Destructor.
TAO_DynCommon::~TAO_DynCommon (void)
{
}
@@ -52,16 +51,17 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
}
- CORBA_TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
- ACE_ENV_ARG_PARAMETER);
+ CORBA::Boolean equivalent =
+ this->type_.in ()->equivalent (tc.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (equivalent)
{
- CORBA_Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
this->from_any (any.in ()
@@ -748,7 +748,7 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
}
- CORBA_Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
this->insert_any (any.in ()
@@ -1415,14 +1415,14 @@ TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
}
else
{
- CORBA_Any_ptr tmp = 0;
+ CORBA::Any_ptr tmp = 0;
ACE_NEW_THROW_EX (tmp,
- CORBA_Any,
+ CORBA::Any,
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
- CORBA_Any_var val = tmp;
+ CORBA::Any_var val = tmp;
if ((this->any_ >>= *tmp) == 0)
{
@@ -1450,7 +1450,7 @@ TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
0);
}
- CORBA_Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
return TAO_DynAnyFactory::make_dyn_any (any.in ()
@@ -1559,7 +1559,7 @@ TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
DynamicAny::DynAny::_nil ());
}
- CORBA_Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
DynamicAny::DynAny_ptr retval =
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index 950896445a0..b740089e731 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -522,7 +522,7 @@ protected:
CORBA::TypeCode_var type_;
// Holder for our type code.
- CORBA_Any any_;
+ CORBA::Any any_;
// Gets a value only for basic types, but used in insert_*
// and get_*, defined in this base class.
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index b12ddf31c3c..f2f64e38f0d 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,12 +1,11 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynEnum_i.h"
#include "DynAnyFactory.h"
-ACE_RCSID(DynamicAny, DynEnum_i, "$Id$")
-// Constructors and destructor
+ACE_RCSID (DynamicAny,
+ DynEnum_i,
+ "$Id$")
+
TAO_DynEnum_i::TAO_DynEnum_i (void)
{
@@ -28,7 +27,7 @@ TAO_DynEnum_i::init_common (void)
}
void
-TAO_DynEnum_i::init (const CORBA_Any &any
+TAO_DynEnum_i::init (const CORBA::Any &any
ACE_ENV_ARG_DECL)
{
CORBA::TypeCode_var tc = any.type ();
@@ -56,7 +55,7 @@ TAO_DynEnum_i::init (const CORBA_Any &any
}
void
-TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc
+TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -198,7 +197,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
// ****************************************************************
void
-TAO_DynEnum_i::from_any (const CORBA_Any& any
+TAO_DynEnum_i::from_any (const CORBA::Any& any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -237,9 +236,9 @@ TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
out_cdr.write_ulong (this->value_);
- CORBA_Any *retval;
+ CORBA::Any *retval;
ACE_NEW_THROW_EX (retval,
- CORBA_Any (this->type_.in (),
+ CORBA::Any (this->type_.in (),
0,
TAO_ENCAP_BYTE_ORDER,
out_cdr.begin ()),
@@ -267,7 +266,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
return 0;
}
- CORBA_Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
ACE_Message_Block *mb = any->_tao_get_cdr ();
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index e22b014d863..b852d1851c6 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -52,11 +52,11 @@ public:
~TAO_DynEnum_i (void);
// Destructor.
- void init (CORBA_TypeCode_ptr tc
+ void init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL);
// Initialize using just a TypeCode.
- void init (const CORBA_Any& any
+ void init (const CORBA::Any& any
ACE_ENV_ARG_DECL);
// Initialize using an Any.
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 731e6a98d16..79f5aab7fcb 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynSequence_i.h"
#include "DynAnyFactory.h"
#include "tao/Marshal.h"
-ACE_RCSID(DynamicAny, DynSequence_i, "$Id$")
-// Constructors and destructor.
+ACE_RCSID (DynamicAny,
+ DynSequence_i,
+ "$Id$")
+
TAO_DynSequence_i::TAO_DynSequence_i (void)
{
@@ -92,7 +91,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any
}
void
-TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc
+TAO_DynSequence_i::init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -160,20 +159,20 @@ TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
// Strip away aliases (if any) on top of the outer type.
CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
while (kind != CORBA::tk_sequence)
{
element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
}
// Return the content type.
CORBA::TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
+ ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
return retval;
}
@@ -650,7 +649,8 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
out_cdr.write_ulong (this->component_count_);
- CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var field_tc =
+ this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
for (CORBA::ULong i = 0; i < this->component_count_; ++i)
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 98a2957fb78..4f35c40e8ec 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -52,11 +52,11 @@ public:
~TAO_DynSequence_i (void);
// Destructor.
- void init (CORBA_TypeCode_ptr tc
+ void init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL);
// Initialize using just a TypeCode.
- void init (const CORBA_Any& any
+ void init (const CORBA::Any& any
ACE_ENV_ARG_DECL);
// Initialize using an Any.
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index c94557da2b7..4d01be3991b 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynStruct_i.h"
#include "DynAnyFactory.h"
#include "tao/Marshal.h"
-ACE_RCSID(DynamicAny, DynStruct_i, "$Id$")
-// Constructors and destructor.
+ACE_RCSID (DynamicAny,
+ DynStruct_i,
+ "$Id$")
+
TAO_DynStruct_i::TAO_DynStruct_i (void)
{
@@ -45,7 +44,7 @@ TAO_DynStruct_i::init_common (void)
}
void
-TAO_DynStruct_i::init (const CORBA_Any& any
+TAO_DynStruct_i::init (const CORBA::Any& any
ACE_ENV_ARG_DECL)
{
CORBA::TypeCode_var tc = any.type ();
@@ -95,7 +94,7 @@ TAO_DynStruct_i::init (const CORBA_Any& any
ACE_CHECK;
// This Any constructor is a TAO extension.
- CORBA_Any field_any (field_tc.in (),
+ CORBA::Any field_any (field_tc.in (),
0,
cdr.byte_order (),
cdr.start ());
@@ -116,7 +115,7 @@ TAO_DynStruct_i::init (const CORBA_Any& any
}
void
-TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc
+TAO_DynStruct_i::init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
this->check_typecode (tc
@@ -475,7 +474,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
// ****************************************************************
void
-TAO_DynStruct_i::from_any (const CORBA_Any & any
+TAO_DynStruct_i::from_any (const CORBA::Any & any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -520,7 +519,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
ACE_CHECK;
// This Any constructor is a TAO extension.
- CORBA_Any field_any (field_tc.in (),
+ CORBA::Any field_any (field_tc.in (),
0,
cdr.byte_order (),
cdr.start ());
@@ -574,11 +573,11 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
for (CORBA::ULong i = 0; i < this->component_count_; ++i)
{
- CORBA_TypeCode_var field_tc = this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var field_tc = this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
// Recursive step.
- CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
@@ -595,12 +594,12 @@ TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
TAO_InputCDR in_cdr (out_cdr);
- CORBA_Any_ptr retval = 0;
+ CORBA::Any_ptr retval = 0;
ACE_NEW_THROW_EX (retval,
- CORBA_Any (this->type_.in (),
- 0,
- in_cdr.byte_order (),
- in_cdr.start ()),
+ CORBA::Any (this->type_.in (),
+ 0,
+ in_cdr.byte_order (),
+ in_cdr.start ()),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index d5354beb633..84a509df9fb 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -52,11 +52,11 @@ public:
~TAO_DynStruct_i (void);
// Destructor.
- void init (CORBA_TypeCode_ptr tc
+ void init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL);
// Initialize using just a TypeCode.
- void init (const CORBA_Any& any
+ void init (const CORBA::Any& any
ACE_ENV_ARG_DECL);
// Initialize using an Any.
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index f4983081d25..61374ebafd9 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,13 +1,12 @@
-/* -*- C++ -*- */
-// $Id$
-
#include "DynUnion_i.h"
#include "DynAnyFactory.h"
#include "tao/Marshal.h"
-ACE_RCSID(DynamicAny, DynUnion_i, "$Id$")
-// Constructors and destructor.
+ACE_RCSID (DynamicAny,
+ DynUnion_i,
+ "$Id$")
+
TAO_DynUnion_i::TAO_DynUnion_i (void)
{
@@ -30,7 +29,7 @@ TAO_DynUnion_i::init_common (void)
}
void
-TAO_DynUnion_i::init (const CORBA_Any& any
+TAO_DynUnion_i::init (const CORBA::Any& any
ACE_ENV_ARG_DECL)
{
CORBA::TypeCode_var tc = any.type ();
@@ -58,7 +57,7 @@ TAO_DynUnion_i::init (const CORBA_Any& any
}
void
-TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc
+TAO_DynUnion_i::init (CORBA::TypeCode_ptr tc
ACE_ENV_ARG_DECL)
{
CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
@@ -136,7 +135,7 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
// This code is common to from_any() and the init() overload that takes
// an Any argument.
void
-TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
+TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
CORBA::Boolean from_factory
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
@@ -153,10 +152,10 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
CORBA::TypeCode_var tc = any.type ();
- CORBA_TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- CORBA_Any disc_any (disc_tc.in (),
+ CORBA::Any disc_any (disc_tc.in (),
0,
cdr.byte_order (),
cdr.start ());
@@ -188,7 +187,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
// Get the index.
for (i = 0; i < count; ++i)
{
- CORBA_Any_var label_any = tc->member_label (i
+ CORBA::Any_var label_any = tc->member_label (i
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
@@ -216,7 +215,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- CORBA_Any member_any (member_tc.in (),
+ CORBA::Any member_any (member_tc.in (),
0,
cdr.byte_order (),
cdr.start ());
@@ -262,7 +261,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- CORBA_Any default_any (default_tc.in (),
+ CORBA::Any default_any (default_tc.in (),
0,
cdr.byte_order (),
cdr.start ());
@@ -328,13 +327,13 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
}
- CORBA_Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
CORBA::ULong length = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- CORBA_Any_var label_any;
+ CORBA::Any_var label_any;
CORBA::ULong i;
// member_label() does not work with aliased type codes.
@@ -570,7 +569,7 @@ TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
CORBA::tk_null);
}
- CORBA_TypeCode_var tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::tk_null);
CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
@@ -666,7 +665,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
CORBA::tk_null);
}
- CORBA_TypeCode_var tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::tk_null);
CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
@@ -679,7 +678,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
// ****************************************************************
void
-TAO_DynUnion_i::from_any (const CORBA_Any& any
+TAO_DynUnion_i::from_any (const CORBA::Any& any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -734,10 +733,10 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
// Add the discriminator to the CDR stream.
- CORBA_TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- CORBA_Any_var disc_any = this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var disc_any = this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
ACE_Message_Block *disc_mb = disc_any->_tao_get_cdr ();
@@ -753,10 +752,10 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
// Add the member to the CDR stream.
- CORBA_TypeCode_var member_tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::TypeCode_var member_tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- CORBA_Any_var member_any = this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::Any_var member_any = this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
ACE_Message_Block *member_mb = member_any->_tao_get_cdr ();
@@ -773,9 +772,9 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
// Make the Any.
TAO_InputCDR in_cdr (out_cdr);
- CORBA_Any_ptr retval = 0;
+ CORBA::Any_ptr retval = 0;
ACE_NEW_THROW_EX (retval,
- CORBA_Any (this->type_.in (),
+ CORBA::Any (this->type_.in (),
0,
in_cdr.byte_order (),
in_cdr.start ()),
@@ -901,8 +900,8 @@ TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
// ****************************************************************
CORBA::Boolean
-TAO_DynUnion_i::label_match (const CORBA_Any &my_any,
- const CORBA_Any &other_any
+TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
+ const CORBA::Any &other_any
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((
CORBA::SystemException
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index b5f5e412fd4..c5038b1bf9a 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -50,10 +50,10 @@ public:
~TAO_DynUnion_i (void);
// Destructor.
- void init (const CORBA_Any& any ACE_ENV_ARG_DECL);
+ void init (const CORBA::Any& any ACE_ENV_ARG_DECL);
// Constructor taking an Any argument.
- void init (CORBA_TypeCode_ptr tc ACE_ENV_ARG_DECL);
+ void init (CORBA::TypeCode_ptr tc ACE_ENV_ARG_DECL);
// Constructor taking a typecode argument.
// = LocalObject methods.
@@ -180,7 +180,7 @@ public:
private:
// Code common to the constructor from an Any arg and the member
// function from_any().
- void set_from_any (const CORBA_Any &any,
+ void set_from_any (const CORBA::Any &any,
CORBA::Boolean from_factory
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
@@ -193,8 +193,8 @@ private:
void init_common (void);
// Iterative check for label value match.
- CORBA::Boolean label_match (const CORBA_Any &my_any,
- const CORBA_Any &other_any
+ CORBA::Boolean label_match (const CORBA::Any &my_any,
+ const CORBA::Any &other_any
ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index da91919ac68..45edae5689b 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -342,7 +342,7 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const
// Default constructor.
DynamicAny::DynAny::InvalidValue::InvalidValue (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0",
"InvalidValue"
)
@@ -356,7 +356,7 @@ DynamicAny::DynAny::InvalidValue::~InvalidValue (void)
// Copy constructor.
DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -367,7 +367,7 @@ DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::Inva
DynamicAny::DynAny::InvalidValue&
DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::InvalidValue &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -426,7 +426,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode (
// Default constructor.
DynamicAny::DynAny::TypeMismatch::TypeMismatch (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0",
"TypeMismatch"
)
@@ -440,7 +440,7 @@ DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void)
// Copy constructor.
DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -451,7 +451,7 @@ DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::Type
DynamicAny::DynAny::TypeMismatch&
DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -2355,7 +2355,7 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer
void
DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL
)
{
@@ -2364,7 +2364,7 @@ DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
ACE_CHECK;
}
-CORBA_Object*
+CORBA::Object*
DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_upcast (void *src) const
{
DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, src);
@@ -3665,7 +3665,7 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const
// Default constructor.
DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0",
"InconsistentTypeCode"
)
@@ -3679,7 +3679,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void)
// Copy constructor.
DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -3690,7 +3690,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::D
DynamicAny::DynAnyFactory::InconsistentTypeCode&
DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 2be2bf31127..8051a77603d 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -145,7 +145,7 @@ TAO_NAMESPACE DynamicAny
#define _DYNAMICANY_DYNANY_CH_
class TAO_DynamicAny_Export DynAny
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2134,10 +2134,10 @@ TAO_NAMESPACE DynamicAny
virtual void _downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
- virtual CORBA_Object* _upcast (void *src) const;
+ virtual CORBA::Object* _upcast (void *src) const;
};
#endif /* end #if !defined */
@@ -2868,7 +2868,7 @@ TAO_NAMESPACE DynamicAny
#define _DYNAMICANY_DYNANYFACTORY_CH_
class TAO_DynamicAny_Export DynAnyFactory
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index 5f7084c29a5..65ce36c3320 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -30,6 +30,7 @@ class TAO_Pluggable_Reply_Params;
class TAO_Pluggable_Reply_Params_Base;
class TAO_GIOP_Locate_Status_Msg;
class TAO_GIOP_Locate_Request_Header;
+class TAO_ServerRequest;
/**
* @class TAO_GIOP_Message_Generator_Parser
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index afe78e63136..ba25c8b9a99 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -29,6 +29,7 @@ class TAO_Operation_Details;
class TAO_Pluggable_Reply_Params;
class TAO_GIOP_Locate_Request_Header;
class TAO_Queued_Data;
+class TAO_ServerRequest;
/**
* @class TAO_GIOP_Message_Lite
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 2702168bf3a..9f2385ee76c 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -168,7 +168,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
if (!ior || !*ior)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -200,7 +200,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
this->version_.minor > TAO_DEF_GIOP_MINOR)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -215,7 +215,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
{
// No object key delimiter or no hostname specified.
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -230,7 +230,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
{
// No hostname specified! It is required by the spec.
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -284,7 +284,7 @@ TAO_IIOP_Profile::parse_string (const char *ior
// @@ What's the right exception to throw here?
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -331,7 +331,7 @@ CORBA::ULong
TAO_IIOP_Profile::hash (CORBA::ULong max
ACE_ENV_ARG_DECL_NOT_USED)
{
- // Get the hashvalue for all endpoints.
+ // Get the hash value for all endpoints.
CORBA::ULong hashval = 0;
for (TAO_IIOP_Endpoint *endp = &this->endpoint_;
endp != 0;
@@ -377,7 +377,7 @@ char *
TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
{
CORBA::String_var key;
- TAO_ObjectKey::encode_sequence_to_string (key.inout(),
+ TAO_ObjectKey::encode_sequence_to_string (key.inout (),
this->object_key_);
u_int buflen = (8 /* "corbaloc" */ +
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 2685c73c8b4..60d93a29818 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1899,8 +1899,8 @@ const char* IOP::Codec::_interface_repository_id (void) const
// Default constructor.
IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
- : CORBA_UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
- "InvalidTypeForEncoding")
+ : CORBA::UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0",
+ "InvalidTypeForEncoding")
{
}
@@ -1911,8 +1911,8 @@ IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
// Copy constructor.
IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id (),
- _tao_excp._name ())
+ : CORBA::UserException (_tao_excp._rep_id (),
+ _tao_excp._name ())
{
}
@@ -1920,7 +1920,7 @@ IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::
IOP::Codec::InvalidTypeForEncoding&
IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -2030,8 +2030,8 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
// Default constructor.
IOP::Codec::FormatMismatch::FormatMismatch (void)
- : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
- "FormatMismatch")
+ : CORBA::UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0",
+ "FormatMismatch")
{
}
@@ -2042,7 +2042,7 @@ IOP::Codec::FormatMismatch::~FormatMismatch (void)
// Copy constructor.
IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id (),
+ : CORBA::UserException (_tao_excp._rep_id (),
_tao_excp._name ())
{
}
@@ -2051,7 +2051,7 @@ IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &
IOP::Codec::FormatMismatch&
IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -2157,8 +2157,8 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
// Default constructor.
IOP::Codec::TypeMismatch::TypeMismatch (void)
- : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
- "TypeMismatch")
+ : CORBA::UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0",
+ "TypeMismatch")
{
}
@@ -2169,8 +2169,8 @@ IOP::Codec::TypeMismatch::~TypeMismatch (void)
// Copy constructor.
IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id (),
- _tao_excp._name ())
+ : CORBA::UserException (_tao_excp._rep_id (),
+ _tao_excp._name ())
{
}
@@ -2178,7 +2178,7 @@ IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_e
IOP::Codec::TypeMismatch&
IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -2738,8 +2738,8 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const
// Default constructor.
IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
- : CORBA_UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
- "UnknownEncoding")
+ : CORBA::UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0",
+ "UnknownEncoding")
{
}
@@ -2750,8 +2750,8 @@ IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
// Copy constructor.
IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id (),
- _tao_excp._name ())
+ : CORBA::UserException (_tao_excp._rep_id (),
+ _tao_excp._name ())
{
}
@@ -2759,7 +2759,7 @@ IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::
IOP::CodecFactory::UnknownEncoding&
IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 943dcaf54c3..725f4d47017 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -41,7 +41,7 @@
// Default constructor.
TAO_IOP::EmptyProfileList::EmptyProfileList (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:TAO_IOP/EmptyProfileList:1.0",
"EmptyProfileList"
)
@@ -55,7 +55,7 @@ TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
// Copy constructor.
TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -66,7 +66,7 @@ TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &
TAO_IOP::EmptyProfileList&
TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -183,7 +183,7 @@ CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
// Default constructor.
TAO_IOP::NotFound::NotFound (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:TAO_IOP/NotFound:1.0",
"NotFound"
)
@@ -197,7 +197,7 @@ TAO_IOP::NotFound::~NotFound (void)
// Copy constructor.
TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -208,7 +208,7 @@ TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
TAO_IOP::NotFound&
TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -321,7 +321,7 @@ CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
// Default constructor.
TAO_IOP::Duplicate::Duplicate (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:TAO_IOP/Duplicate:1.0",
"Duplicate"
)
@@ -335,7 +335,7 @@ TAO_IOP::Duplicate::~Duplicate (void)
// Copy constructor.
TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -346,7 +346,7 @@ TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
TAO_IOP::Duplicate&
TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -459,7 +459,7 @@ CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
// Default constructor.
TAO_IOP::Invalid_IOR::Invalid_IOR (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:TAO_IOP/Invalid_IOR:1.0",
"Invalid_IOR"
)
@@ -473,7 +473,7 @@ TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
// Copy constructor.
TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -484,7 +484,7 @@ TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
TAO_IOP::Invalid_IOR&
TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -597,7 +597,7 @@ CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
// Default constructor.
TAO_IOP::MultiProfileList::MultiProfileList (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:TAO_IOP/MultiProfileList:1.0",
"MultiProfileList"
)
@@ -611,7 +611,7 @@ TAO_IOP::MultiProfileList::~MultiProfileList (void)
// Copy constructor.
TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -622,7 +622,7 @@ TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &
TAO_IOP::MultiProfileList&
TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -1412,7 +1412,7 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
void
TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL
)
{
@@ -1421,7 +1421,7 @@ TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Ma
ACE_CHECK;
}
-CORBA_Object*
+CORBA::Object*
TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_upcast (void *src) const
{
CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src);
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 9685178d0ca..b5b968cd499 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -357,7 +357,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
#define _TAO_IOP_TAO_IOR_PROPERTY_CH_
class TAO_IORManip_Export TAO_IOR_Property
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -523,7 +523,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
#define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
class TAO_IORManip_Export TAO_IOR_Manipulation
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -597,10 +597,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
virtual void _downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
- virtual CORBA_Object* _upcast (void *src) const;
+ virtual CORBA::Object* _upcast (void *src) const;
};
#endif /* end #if !defined */
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index 6b84ca74907..10bf30d6352 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -41,7 +41,7 @@
// Default constructor.
IORTable::AlreadyBound::AlreadyBound (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:IORTable/AlreadyBound:1.0",
"AlreadyBound"
)
@@ -55,7 +55,7 @@ IORTable::AlreadyBound::~AlreadyBound (void)
// Copy constructor.
IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -66,7 +66,7 @@ IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
IORTable::AlreadyBound&
IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -141,7 +141,7 @@ void IORTable::AlreadyBound::_tao_decode (
// Default constructor.
IORTable::NotFound::NotFound (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:IORTable/NotFound:1.0",
"NotFound"
)
@@ -155,7 +155,7 @@ IORTable::NotFound::~NotFound (void)
// Copy constructor.
IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -166,7 +166,7 @@ IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
IORTable::NotFound&
IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index d957a528983..caca2220eb9 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -297,7 +297,7 @@ TAO_NAMESPACE IORTable
#define _IORTABLE_TABLE_CH_
class TAO_IORTable_Export Table
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -462,7 +462,7 @@ TAO_NAMESPACE IORTable
#define _IORTABLE_LOCATOR_CH_
class TAO_IORTable_Export Locator
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index f5a34bc3a93..0f073cf3340 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -97,7 +97,7 @@ CORBA::Object_ptr
TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
const TAO_MProfile &)
{
- return new CORBA_Object (stub);
+ return new CORBA::Object (stub);
}
// ****************************************************************
diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp
index bd409204bfc..36ffe0c104e 100644
--- a/TAO/tao/Interceptor_List.cpp
+++ b/TAO/tao/Interceptor_List.cpp
@@ -75,7 +75,7 @@ TAO_Interceptor_List::add_interceptor_i (
}
else
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 7e8d96c8beb..f1c3531f4c2 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -182,7 +182,7 @@ TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
if (this->stub_ == 0)
{
ACE_THROW (CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -248,7 +248,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
if (conn_reg == 0)
{
ACE_THROW_RETURN (CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
@@ -291,7 +291,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
if (!is_conn_timeout)
{
ACE_THROW_RETURN (CORBA::TIMEOUT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_TIMEOUT_CONNECT_MINOR_CODE,
errno),
CORBA::COMPLETED_NO),
@@ -441,7 +441,7 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean write_semantics
{
ACE_THROW_RETURN (
CORBA::TIMEOUT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_TIMEOUT_SEND_MINOR_CODE,
errno
),
@@ -691,9 +691,10 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
{
// Just unbind the dispatcher before we take any action.
(void) dispatch_guard.unbind_dispatcher ();
- return this->orb_core_->service_raise_comm_failure (this,
- this->profile_
- ACE_ENV_ARG_PARAMETER);
+ return
+ this->orb_core_->service_raise_comm_failure (this,
+ this->profile_
+ ACE_ENV_ARG_PARAMETER);
}
// @@ Alex: the old version of this had some error handling code,
// like: this->profile_->reset_hint ()
@@ -772,7 +773,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
#if defined (TAO_HAS_EXCEPTIONS)
// Without this, the call to create_system_exception() above
// causes a memory leak. On platforms without native exceptions,
- // the CORBA_Environment class manages the memory.
+ // the CORBA::Environment class manages the memory.
auto_ptr<CORBA::SystemException> safety (ex);
#endif
@@ -850,7 +851,7 @@ TAO_GIOP_Synch_Invocation::validate_error (TAO_Bind_Dispatcher_Guard &guard
// Just a timeout, don't close the connection or
// anything...
ACE_THROW_RETURN (CORBA::TIMEOUT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_TIMEOUT_SEND_MINOR_CODE,
errno),
CORBA::COMPLETED_NO),
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 76accd46881..090a967e3cb 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -74,7 +74,7 @@ TAO_Default_Endpoint_Selector::forward (TAO_GIOP_Invocation *invocation,
// get created on a per-call basis. For now we'll play it safe.
if (invocation->stub ()->next_profile () == 0)
ACE_THROW (CORBA::TRANSIENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
errno),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 17ea48b5d4b..07518009b7f 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -181,8 +181,8 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
{
// Generate a fake exception....
CORBA::TIMEOUT timeout_failure (
- CORBA_SystemException::_tao_minor_code (TAO_TIMEOUT_SEND_MINOR_CODE,
- errno),
+ CORBA::SystemException::_tao_minor_code (TAO_TIMEOUT_SEND_MINOR_CODE,
+ errno),
CORBA::COMPLETED_NO);
TAO_OutputCDR out_cdr;
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index d420d4b1e80..92e4a41a2f8 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -33,7 +33,7 @@ TAO_Messaging_Initializer::init (void)
ACE_NEW_THROW_EX (temp_orb_initializer,
TAO_Messaging_ORBInitializer,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index 852a7d1a942..14bc6087473 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -447,10 +447,10 @@ Messaging::ExceptionHolder_init::tao_repository_id (void)
return Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
}
-CORBA_ValueBase *
+CORBA::ValueBase *
Messaging::ExceptionHolder_init::create_for_unmarshal (void)
{
- CORBA_ValueBase *ret_val = 0;
+ CORBA::ValueBase *ret_val = 0;
ACE_NEW_RETURN (
ret_val,
OBV_Messaging::ExceptionHolder,
@@ -929,7 +929,7 @@ Messaging::ReplyHandler::_is_a (
}
else
{
- return this->CORBA_Object::_is_a (
+ return this->Object::_is_a (
value
ACE_ENV_ARG_PARAMETER
);
@@ -1397,7 +1397,7 @@ operator<< (
)
{
return
- CORBA_ValueBase::_tao_marshal (
+ CORBA::ValueBase::_tao_marshal (
strm,
ACE_const_cast (
Messaging::ExceptionHolder *,
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index 28b93442dc8..ee3b469f979 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -159,7 +159,7 @@ TAO_NAMESPACE Messaging
#define _MESSAGING_EXCEPTIONHOLDER_CH_
class TAO_Messaging_Export ExceptionHolder
- : public virtual CORBA_ValueBase
+ : public virtual CORBA::ValueBase
{
public:
@@ -274,13 +274,13 @@ protected:
#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CH_)
#define _MESSAGING_EXCEPTIONHOLDER___INIT_CH_
-class TAO_Messaging_Export ExceptionHolder_init : public virtual CORBA_ValueFactoryBase
+class TAO_Messaging_Export ExceptionHolder_init : public virtual CORBA::ValueFactoryBase
{
public:
ExceptionHolder_init (void);
virtual ~ExceptionHolder_init (void);
- static ExceptionHolder_init* _downcast (CORBA_ValueFactoryBase* );
+ static ExceptionHolder_init* _downcast (CORBA::ValueFactoryBase* );
virtual CORBA::ValueBase *create_for_unmarshal (void);
@@ -615,7 +615,7 @@ TAO_NAMESPACE OBV_Messaging
// OBV_ class
class TAO_Messaging_Export ExceptionHolder
: public virtual Messaging::ExceptionHolder,
- public virtual CORBA_DefaultValueRefCountBase
+ public virtual CORBA::DefaultValueRefCountBase
{
public:
// TAO_IDL - Generated from
diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.i
index 0a35837badc..0d6bc04eebd 100644
--- a/TAO/tao/Messaging/MessagingC.i
+++ b/TAO/tao/Messaging/MessagingC.i
@@ -48,7 +48,7 @@ Messaging::ReplyHandler::ReplyHandler (
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
)
- : CORBA_Object (objref, _tao_collocated, servant)
+ : Object (objref, _tao_collocated, servant)
{
this->Messaging_ReplyHandler_setup_collocation (_tao_collocated);
}
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 9d3fb058c60..cb0d3d1370a 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -387,7 +387,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
)
{
POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_servant;
- CORBA_InterfaceDef_ptr _tao_retval = 0;
+ CORBA::InterfaceDef_ptr _tao_retval = 0;
CORBA::Boolean _tao_result = 0;
TAO_IFR_Client_Adapter *_tao_adapter =
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index c210c779248..a82e0706a7d 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -218,7 +218,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
if (CORBA::is_nil (p.in ()))
ACE_THROW (CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_POLICY_NARROW_CODE,
0),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index 75e95c4f693..4302b10da18 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -47,7 +47,7 @@ TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (args,
CORBA::StringSeq,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -166,7 +166,7 @@ TAO_ORBInitInfo::add_client_request_interceptor (
#else
ACE_UNUSED_ARG (interceptor);
ACE_THROW (CORBA::NO_IMPLEMENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOTSUP),
CORBA::COMPLETED_NO));
@@ -190,7 +190,7 @@ TAO_ORBInitInfo::add_server_request_interceptor (
#else
ACE_UNUSED_ARG (interceptor);
ACE_THROW (CORBA::NO_IMPLEMENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOTSUP),
CORBA::COMPLETED_NO));
@@ -222,7 +222,7 @@ TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
return this->orb_core_->pi_current ()->allocate_slot_id ();
#else
ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOTSUP),
CORBA::COMPLETED_NO),
@@ -263,7 +263,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
if (result != 0)
ACE_THROW_RETURN (CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
errno),
CORBA::COMPLETED_NO),
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 391f9741078..68f3347c5e3 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1378,7 +1378,7 @@ TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
invoke->close_connection ();
ACE_THROW_RETURN (CORBA::COMM_FAILURE (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
errno),
CORBA::COMPLETED_MAYBE),
@@ -1399,7 +1399,7 @@ TAO_ORB_Core::service_raise_transient_failure (TAO_GIOP_Invocation *invoke,
}
ACE_THROW_RETURN (CORBA::TRANSIENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_INVOCATION_SEND_REQUEST_MINOR_CODE,
errno),
CORBA::COMPLETED_MAYBE),
@@ -1637,7 +1637,7 @@ TAO_ORB_Core::create_object (TAO_Stub *stub)
// The constructor sets the proxy broker as the
// Remote one.
ACE_NEW_RETURN (x,
- CORBA_Object (stub, 0),
+ CORBA::Object (stub, 0),
0);
return x;
}
@@ -2181,7 +2181,7 @@ TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ORB::ObjectIdList_ptr tmp = 0;
ACE_NEW_THROW_EX (tmp,
- CORBA_ORB_ObjectIdList (total_size),
+ CORBA::ORB::ObjectIdList (total_size),
CORBA::NO_MEMORY ());
ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp
index a76887bbc9f..91009bc9cfc 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjectReferenceTemplateC.cpp
@@ -1532,7 +1532,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceFactory * vt)
CORBA::Boolean
operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ObjectReferenceFactory *_tao_valuetype)
{
- return CORBA_ValueBase::_tao_marshal (strm,
+ return CORBA::ValueBase::_tao_marshal (strm,
ACE_const_cast (PortableInterceptor::ObjectReferenceFactory*, _tao_valuetype),
(ptr_arith_t) &PortableInterceptor::ObjectReferenceFactory::_downcast);
}
@@ -1566,7 +1566,7 @@ CORBA::remove_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
CORBA::Boolean
operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ObjectReferenceTemplate *_tao_valuetype)
{
- return CORBA_ValueBase::_tao_marshal (strm,
+ return CORBA::ValueBase::_tao_marshal (strm,
ACE_const_cast (PortableInterceptor::ObjectReferenceTemplate*, _tao_valuetype),
(ptr_arith_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast);
}
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index 5737082b16f..b4873049f0c 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -157,7 +157,7 @@ TAO_NAMESPACE PortableInterceptor
#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
class TAO_Export ObjectReferenceFactory
- : public virtual CORBA_ValueBase
+ : public virtual CORBA::ValueBase
{
public:
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp
index ca52289c6d8..0228cb8a2c8 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PICurrent.cpp
@@ -141,7 +141,7 @@ TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
ACE_NEW_THROW_EX (any,
CORBA::Any,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -153,7 +153,7 @@ TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
ACE_NEW_THROW_EX (any,
CORBA::Any (table[id]), // Make a copy.
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PICurrent.h
index fa9c922a035..c621dacb9e1 100644
--- a/TAO/tao/PICurrent.h
+++ b/TAO/tao/PICurrent.h
@@ -47,6 +47,7 @@
/// Forward declarations.
class TAO_ORB_Core;
class TAO_PICurrent_Impl;
+class TAO_ServerRequest;
/**
* @class TAO_PICurrent
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index bfd42bcca69..5b23453dff3 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -30,7 +30,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
{
if (CORBA::is_nil (policy_factory))
ACE_THROW (CORBA::BAD_PARAM (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 2acfd50b377..b7478c6c38a 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -146,7 +146,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_shrink_buffer (CORBA::U
void
CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL
)
{
@@ -155,7 +155,7 @@ CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
ACE_CHECK;
}
-CORBA_Object*
+CORBA::Object*
CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) const
{
return tao_CORBA_Policy_upcast (src);
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 8964b32dcc9..f9b49b84f5d 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -32,6 +32,7 @@
#include "tao/TAO_Export.h"
#include "Sequence.h"
#include "CDR.h"
+#include "varbase.h"
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO
@@ -187,10 +188,10 @@ TAO_NAMESPACE CORBA
virtual void _downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
- virtual CORBA_Object* _upcast (void *src) const;
+ virtual CORBA::Object* _upcast (void *src) const;
};
#endif /* end #if !defined */
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index c289b24a51d..5cb43c5884d 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -958,7 +958,7 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const
// Default constructor.
CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0",
"NoPossiblePollable"
)
@@ -972,7 +972,7 @@ CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
// Copy constructor.
CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -983,7 +983,7 @@ CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::Polla
CORBA::PollableSet::NoPossiblePollable&
CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -1042,7 +1042,7 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode (
// Default constructor.
CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0",
"UnknownPollable"
)
@@ -1056,7 +1056,7 @@ CORBA::PollableSet::UnknownPollable::~UnknownPollable (void)
// Copy constructor.
CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -1067,7 +1067,7 @@ CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet
CORBA::PollableSet::UnknownPollable&
CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::UnknownPollable &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 5752e5ace91..7d363500b53 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -222,7 +222,7 @@ TAO_NAMESPACE CORBA
#define _CORBA_POLLABLE_CH_
class TAO_Export Pollable
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -496,7 +496,7 @@ TAO_NAMESPACE CORBA
#define _CORBA_POLLABLESET_CH_
class TAO_Export PollableSet
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 62a2213a918..2b81dac776b 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -342,7 +342,7 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co
// Default constructor.
PortableInterceptor::ForwardRequest::ForwardRequest (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:PortableInterceptor/ForwardRequest:1.0",
"ForwardRequest"
)
@@ -356,7 +356,7 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void)
// Copy constructor.
PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -369,7 +369,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor
PortableInterceptor::ForwardRequest&
PortableInterceptor::ForwardRequest::operator= (const ::PortableInterceptor::ForwardRequest &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
this->permanent = _tao_excp.permanent;
return *this;
@@ -448,7 +448,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
const CORBA::Object_ptr _tao_forward,
CORBA::Boolean _tao_permanent
)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:PortableInterceptor/ForwardRequest:1.0",
"ForwardRequest"
)
@@ -619,7 +619,7 @@ TAO_NAMESPACE_END
// Default constructor.
PortableInterceptor::InvalidSlot::InvalidSlot (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:PortableInterceptor/InvalidSlot:1.0",
"InvalidSlot"
)
@@ -633,7 +633,7 @@ PortableInterceptor::InvalidSlot::~InvalidSlot (void)
// Copy constructor.
PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -644,7 +644,7 @@ PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::Inva
PortableInterceptor::InvalidSlot&
PortableInterceptor::InvalidSlot::operator= (const ::PortableInterceptor::InvalidSlot &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -3852,7 +3852,7 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co
// Default constructor.
PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
"DuplicateName"
)
@@ -3866,7 +3866,7 @@ PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void)
// Copy constructor.
PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -3878,7 +3878,7 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::Portable
PortableInterceptor::ORBInitInfo::DuplicateName&
PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
this->name = CORBA::string_dup (_tao_excp.name.in ());
return *this;
}
@@ -3939,7 +3939,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
const char * _tao_name
)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0",
"DuplicateName"
)
@@ -3949,7 +3949,7 @@ PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (
// Default constructor.
PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0",
"InvalidName"
)
@@ -3963,7 +3963,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void)
// Copy constructor.
PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -3974,7 +3974,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInte
PortableInterceptor::ORBInitInfo::InvalidName&
PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 8cf394494c0..c3fcee94899 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -146,7 +146,7 @@ TAO_NAMESPACE PortableInterceptor
#define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
class TAO_Export Interceptor
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -549,7 +549,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
#define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
class TAO_Export RequestInfo
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1560,7 +1560,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
#define _PORTABLEINTERCEPTOR_IORINFO_CH_
class TAO_Export IORInfo
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1917,7 +1917,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
#define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
class TAO_Export PolicyFactory
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2065,7 +2065,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
#define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
class TAO_Export ORBInitInfo
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2289,7 +2289,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
/// table.
TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
ORBInitializer_ptr init
- TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS);
#endif /* end #if !defined */
@@ -2368,7 +2368,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
#define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
class TAO_Export ORBInitializer
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp
index 8edbda3b86a..1bd578baca1 100644
--- a/TAO/tao/PortableServer/Collocated_Object.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object.cpp
@@ -44,7 +44,7 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id
{
// If the object is collocated then try locally....
if (!this->_is_collocated ())
- return this->CORBA_Object::_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
+ return this->Object::_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
if (this->_stubobj ()->type_id.in () != 0
&& ACE_OS::strcmp (logical_type_id,
@@ -83,12 +83,12 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id
}
CORBA::Boolean
-TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj
+TAO_Collocated_Object::_is_equivalent (CORBA::Object_ptr other_obj
ACE_ENV_ARG_DECL)
ACE_THROW_SPEC (())
{
CORBA::Boolean equivalent =
- this->CORBA_Object::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER);
+ this->Object::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
if (equivalent)
@@ -118,7 +118,7 @@ TAO_Collocated_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL)
{
// If the object is collocated then try locally....
if (!this->_is_collocated ())
- return this->CORBA_Object::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->Object::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
TAO_Stub *stub = this->_stubobj ();
@@ -170,7 +170,7 @@ TAO_Collocated_Object::_get_component (ACE_ENV_SINGLE_ARG_DECL)
// If the object is collocated then try locally....
if (!this->_is_collocated ())
- return this->CORBA_Object::_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return this->Object::_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
TAO_Stub *stub = this->_stubobj ();
@@ -213,7 +213,7 @@ TAO_Collocated_Object::_tao_QueryInterface (ptr_arith_t query_type)
return this;
}
- return this->CORBA_Object::_tao_QueryInterface (query_type);
+ return this->Object::_tao_QueryInterface (query_type);
}
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h
index 4d5175c9a5a..5b3c92e4dfc 100644
--- a/TAO/tao/PortableServer/Collocated_Object.h
+++ b/TAO/tao/PortableServer/Collocated_Object.h
@@ -24,12 +24,22 @@
#include "tao/Object.h"
-#include "Servant_Base.h"
-class TAO_PortableServer_Export TAO_Collocated_Object : public virtual CORBA_Object
+class TAO_ServantBase;
+
+/**
+ * @class TAO_Collocated_Object
+ *
+ * @brief TAO_Collocated_Object
+ *
+ * TAO_Collocated_Object
+ */
+class TAO_PortableServer_Export TAO_Collocated_Object
+ : public virtual CORBA::Object
{
public:
+
/// Constructor.
TAO_Collocated_Object (TAO_Stub *p = 0,
CORBA::Boolean collocated = 0,
@@ -47,18 +57,20 @@ public:
static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
- // = The CORBA_Object methods, check the tao/Object.h file for details
+ // = The CORBA::Object methods, check the tao/Object.h file for details
virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
- virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj
+ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC (());
#if (TAO_HAS_MINIMUM_CORBA == 0)
virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- virtual CORBA::Object_ptr _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual CORBA::Object_ptr _get_component
+ (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
#endif /* TAO_HAS_MINIMUM_CORBA */
- virtual void *_tao_QueryInterface(ptr_arith_t type);
+
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
private:
// = Unimplemented methods
diff --git a/TAO/tao/PortableServer/Collocated_Object.i b/TAO/tao/PortableServer/Collocated_Object.i
index 438540f0863..a99b4205204 100644
--- a/TAO/tao/PortableServer/Collocated_Object.i
+++ b/TAO/tao/PortableServer/Collocated_Object.i
@@ -7,6 +7,6 @@ ACE_INLINE
TAO_Collocated_Object::TAO_Collocated_Object (TAO_Stub *p,
CORBA::Boolean collocated,
TAO_ServantBase *servant)
- : CORBA_Object (p, collocated, servant)
+ : Object (p, collocated, servant)
{
}
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index a892a7915bb..f1dcf238e9e 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -562,7 +562,7 @@ operator<< (
)
{
return
- CORBA_ValueBase::_tao_marshal (
+ CORBA::ValueBase::_tao_marshal (
strm,
ACE_const_cast (
TAO_Default_ORT::ObjectReferenceTemplate *,
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index 53aab7bbff6..de08280d311 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -149,7 +149,7 @@ TAO_NAMESPACE TAO_Default_ORT
class ObjectReferenceTemplate
: public virtual PortableInterceptor::ObjectReferenceTemplate,
- public virtual CORBA_ValueBase
+ public virtual CORBA::ValueBase
{
public:
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
index d71b07c7501..3b03a778879 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
@@ -1,20 +1,15 @@
-// $Id$
-
#include "Direct_Object_Proxy_Impl.h"
#include "Object_Adapter.h"
#include "tao/Object.h"
-ACE_RCSID(tao, TAO_Direct_Object_Proxy_Impl, "$Id$")
-TAO_Direct_Object_Proxy_Impl::TAO_Direct_Object_Proxy_Impl (void)
-{
- // No-op
-}
+ACE_RCSID (PortableServer,
+ TAO_Direct_Object_Proxy_Impl,
+ "$Id$")
TAO_Direct_Object_Proxy_Impl::~TAO_Direct_Object_Proxy_Impl (void)
{
- // No-op
}
CORBA::Boolean
@@ -38,7 +33,8 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
ACE_TRY
{
if (target->_servant () != 0)
- return target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
+ return target->_servant ()->_non_existent (
+ ACE_ENV_SINGLE_ARG_PARAMETER);
// @@ Maybe we want to change this exception...
ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
@@ -47,37 +43,40 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
{
_tao_retval = 1;
}
- ACE_CATCHANY
- {
- ACE_RE_THROW;
- }
ACE_ENDTRY;
+ ACE_CHECK_RETURN (0);
return _tao_retval;
}
-CORBA_InterfaceDef_ptr
+CORBA::InterfaceDef_ptr
TAO_Direct_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
ACE_ENV_ARG_DECL)
{
ACE_TRY
{
if (target->_servant () != 0)
- return target->_servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-
- // @@ Maybe we want to change this exception...
- ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
+ {
+ // CORBA::InterfaceDef_var not available.
+ CORBA::InterfaceDef_ptr r =
+ target->_servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
+
+ return r;
+ }
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
- }
- ACE_CATCHANY
- {
- ACE_RE_THROW;
+ // Ignore this exception.
}
ACE_ENDTRY;
+ ACE_CHECK_RETURN (0); // CORBA::InterfaceDef::_nil() not
+ // available.
- return 0;
+ // @@ Maybe we want to change this exception...
+ ACE_THROW_RETURN (CORBA::INV_OBJREF (),
+ 0); // CORBA::InterfaceDef::_nil() not
+ // available.
}
CORBA::Object_ptr
@@ -87,20 +86,23 @@ TAO_Direct_Object_Proxy_Impl::_get_component (const CORBA::Object_ptr target
ACE_TRY
{
if (target->_servant () != 0)
- return target->_servant ()->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+ {
+ CORBA::Object_var r =
+ target->_servant ()->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+ ACE_TRY_CHECK;
- // @@ Maybe we want to change this exception...
- ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
+ return r._retn ();
+ }
}
ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
{
- }
- ACE_CATCHANY
- {
- ACE_RE_THROW;
+ // Ignore this exception.
}
ACE_ENDTRY;
+ ACE_CHECK_RETURN (CORBA::Object::_nil ());
- return 0;
+ // @@ Maybe we want to change this exception...
+ ACE_THROW_RETURN (CORBA::INV_OBJREF (), CORBA::Object::_nil ());
}
+
#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
index d47170f7265..9c926f2ed94 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
//=============================================================================
/**
@@ -17,32 +18,32 @@
#ifndef TAO_DIRECT_OBJECT_PROXY_IMPL_H_
#define TAO_DIRECT_OBJECT_PROXY_IMPL_H_
-#include "portableserver_export.h"
-// -- ACE Include --
#include "ace/pre.h"
-// -- TAO Include --
-#include "tao/Object_Proxy_Impl.h"
-
#include "portableserver_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/Object_Proxy_Impl.h"
+
+
/**
* @class TAO_Direct_Object_Proxy_Impl
*
- * @brief This class implements the direct proxy for the CORBA::Object class.
+ * @brief This class implements the direct proxy for the CORBA::Object
+ * class.
+ *
+ * This class implements the direct proxy for the CORBA::Object
+ * class.
*/
-class TAO_PortableServer_Export TAO_Direct_Object_Proxy_Impl :
- public virtual TAO_Object_Proxy_Impl
+class TAO_PortableServer_Export TAO_Direct_Object_Proxy_Impl
+ : public virtual TAO_Object_Proxy_Impl
{
public:
- TAO_Direct_Object_Proxy_Impl (void);
-
virtual ~TAO_Direct_Object_Proxy_Impl (void);
virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
@@ -54,7 +55,7 @@ public:
virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
ACE_ENV_ARG_DECL);
- virtual CORBA_InterfaceDef_ptr _get_interface (
+ virtual CORBA::InterfaceDef_ptr _get_interface (
const CORBA::Object_ptr target
ACE_ENV_ARG_DECL
);
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index 4ab32c78519..85169dbffca 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp
@@ -945,7 +945,7 @@ ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::_TAO_Locator_Remote_Pr
// Remote Implementation of the IDL interface methods
void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1157,7 +1157,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
}
void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1364,7 +1364,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
}
void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1571,7 +1571,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
}
void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1778,7 +1778,7 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
}
CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -2004,7 +2004,7 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
}
CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -2447,7 +2447,7 @@ ImplementationRepository::Locator::_is_a (
}
else
{
- return this->CORBA_Object::_is_a (
+ return this->Object::_is_a (
value
ACE_ENV_ARG_PARAMETER
);
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index a17bc745e00..08a7e87c8f6 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.h
@@ -329,7 +329,7 @@ TAO_NAMESPACE ImplementationRepository
public:
virtual ~_TAO_Locator_Proxy_Impl (void) { }
virtual void activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -341,7 +341,7 @@ TAO_NAMESPACE ImplementationRepository
)) = 0;
virtual void remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -352,7 +352,7 @@ TAO_NAMESPACE ImplementationRepository
)) = 0;
virtual void shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -363,7 +363,7 @@ TAO_NAMESPACE ImplementationRepository
)) = 0;
virtual void server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -374,7 +374,7 @@ TAO_NAMESPACE ImplementationRepository
)) = 0;
virtual CORBA::ULong register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -385,7 +385,7 @@ TAO_NAMESPACE ImplementationRepository
)) = 0;
virtual CORBA::ULong unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -422,7 +422,7 @@ TAO_NAMESPACE ImplementationRepository
virtual ~_TAO_Locator_Remote_Proxy_Impl (void) { }
virtual void activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -434,7 +434,7 @@ TAO_NAMESPACE ImplementationRepository
));
virtual void remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -445,7 +445,7 @@ TAO_NAMESPACE ImplementationRepository
));
virtual void shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -456,7 +456,7 @@ TAO_NAMESPACE ImplementationRepository
));
virtual void server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -467,7 +467,7 @@ TAO_NAMESPACE ImplementationRepository
));
virtual CORBA::ULong register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -478,7 +478,7 @@ TAO_NAMESPACE ImplementationRepository
));
virtual CORBA::ULong unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i
index fe4e4ce290c..bbfa02898d2 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.i
+++ b/TAO/tao/PortableServer/ImR_LocatorC.i
@@ -31,7 +31,7 @@ ImplementationRepository::Locator::Locator (
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
)
- : CORBA_Object (objref, _tao_collocated, servant)
+ : Object (objref, _tao_collocated, servant)
{
this->ImplementationRepository_Locator_setup_collocation (_tao_collocated);
}
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index 342f3c88cef..b70622170e8 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -1310,7 +1310,7 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_Thru
// ThruPOA Implementation of the IDL interface methods
void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1350,7 +1350,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_ser
}
void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1389,7 +1389,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_serve
}
void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1428,7 +1428,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_ser
}
void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1467,7 +1467,7 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_sh
}
CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -1508,7 +1508,7 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::regi
}
CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -1561,7 +1561,7 @@ POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::_TAO_Locator_Direc
{}
void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1583,7 +1583,7 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_serv
}
void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1604,7 +1604,7 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server
}
void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1625,7 +1625,7 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_serv
}
void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -1646,7 +1646,7 @@ void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shu
}
CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -1667,7 +1667,7 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::regis
}
CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -2541,7 +2541,7 @@ void POA_ImplementationRepository::Locator::_interface_skel (
)
{
POA_ImplementationRepository::Locator *_tao_impl = (POA_ImplementationRepository::Locator *) _tao_servant;
- CORBA_InterfaceDef_ptr _tao_retval = 0;
+ CORBA::InterfaceDef_ptr _tao_retval = 0;
CORBA::Boolean _tao_result = 0;
TAO_IFR_Client_Adapter *_tao_adapter =
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h
index 0df99af9393..aa76b25340c 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS.h
@@ -413,7 +413,7 @@ TAO_NAMESPACE POA_ImplementationRepository
virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) { }
virtual void activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -425,7 +425,7 @@ TAO_NAMESPACE POA_ImplementationRepository
));
virtual void remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -436,7 +436,7 @@ TAO_NAMESPACE POA_ImplementationRepository
));
virtual void shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -447,7 +447,7 @@ TAO_NAMESPACE POA_ImplementationRepository
));
virtual void server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -458,7 +458,7 @@ TAO_NAMESPACE POA_ImplementationRepository
));
virtual CORBA::ULong register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -469,7 +469,7 @@ TAO_NAMESPACE POA_ImplementationRepository
));
virtual CORBA::ULong unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -503,7 +503,7 @@ public:
virtual ~_TAO_Locator_Direct_Proxy_Impl (void) { }
virtual void activate_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -515,7 +515,7 @@ public:
));
virtual void remove_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -526,7 +526,7 @@ public:
));
virtual void shutdown_server_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -537,7 +537,7 @@ public:
));
virtual void server_is_shutting_down_in_location (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * location
ACE_ENV_ARG_DECL
@@ -548,7 +548,7 @@ public:
));
virtual CORBA::ULong register_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
@@ -559,7 +559,7 @@ public:
));
virtual CORBA::ULong unregister_activator (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * location,
CORBA::Object_ptr object_ref
ACE_ENV_ARG_DECL
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 5e3080c01ec..f2e76a01705 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -456,7 +456,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -633,7 +633,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -1015,12 +1015,7 @@ ImplementationRepository::ServerObject::_is_a (
return 1; // success using local knowledge
}
else
- {
- return this->CORBA_Object::_is_a (
- value
- ACE_ENV_ARG_PARAMETER
- );
- }
+ return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);
}
void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type)
@@ -1146,7 +1141,7 @@ TAO_NAMESPACE_END
// be/be_visitor_exception/exception_cs.cpp:63
ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:ImplementationRepository/AlreadyRegistered:1.0",
"AlreadyRegistered"
)
@@ -1158,7 +1153,7 @@ ImplementationRepository::AlreadyRegistered::~AlreadyRegistered (void)
}
ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -1168,7 +1163,7 @@ ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::Implemen
ImplementationRepository::AlreadyRegistered&
ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -1297,7 +1292,7 @@ TAO_NAMESPACE_END
// be/be_visitor_exception/exception_cs.cpp:63
ImplementationRepository::CannotActivate::CannotActivate (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:ImplementationRepository/CannotActivate:1.0",
"CannotActivate"
)
@@ -1309,7 +1304,7 @@ ImplementationRepository::CannotActivate::~CannotActivate (void)
}
ImplementationRepository::CannotActivate::CannotActivate (const ::ImplementationRepository::CannotActivate &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -1320,7 +1315,7 @@ ImplementationRepository::CannotActivate::CannotActivate (const ::Implementation
ImplementationRepository::CannotActivate&
ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepository::CannotActivate &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
this->reason = CORBA::string_dup (_tao_excp.reason.in ());
return *this;
}
@@ -1401,7 +1396,8 @@ void ImplementationRepository::CannotActivate::_tao_decode (
ImplementationRepository::CannotActivate::CannotActivate (
const char * _tao_reason
- ) : CORBA_UserException (
+ )
+ : CORBA::UserException (
"IDL:ImplementationRepository/CannotActivate:1.0",
"CannotActivate"
)
@@ -1468,7 +1464,7 @@ TAO_NAMESPACE_END
// be/be_visitor_exception/exception_cs.cpp:63
ImplementationRepository::NotFound::NotFound (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:ImplementationRepository/NotFound:1.0",
"NotFound"
)
@@ -1480,7 +1476,7 @@ ImplementationRepository::NotFound::~NotFound (void)
}
ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::NotFound &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -1490,7 +1486,7 @@ ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::
ImplementationRepository::NotFound&
ImplementationRepository::NotFound::operator= (const ::ImplementationRepository::NotFound &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -4128,7 +4124,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -4333,7 +4329,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -4565,7 +4561,7 @@ CORBA::String_var _tao_retval;
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -4768,7 +4764,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -4962,7 +4958,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -5162,7 +5158,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -5362,7 +5358,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -5592,7 +5588,7 @@ CORBA::String_var _tao_retval;
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -5792,7 +5788,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -6010,7 +6006,7 @@ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -6427,12 +6423,7 @@ ImplementationRepository::Administration::_is_a (
return 1; // success using local knowledge
}
else
- {
- return this->CORBA_Object::_is_a (
- value
- ACE_ENV_ARG_PARAMETER
- );
- }
+ return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);
}
void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type)
@@ -7196,7 +7187,7 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::_TAO
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -7418,7 +7409,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -7800,12 +7791,7 @@ ImplementationRepository::ServerInformationIterator::_is_a (
return 1; // success using local knowledge
}
else
- {
- return this->CORBA_Object::_is_a (
- value
- ACE_ENV_ARG_PARAMETER
- );
- }
+ return this->Object::_is_a (value ACE_ENV_ARG_PARAMETER);
}
void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type)
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index beabde8d97a..b885d40ddc9 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -271,7 +271,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -282,7 +282,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -318,7 +318,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -329,7 +329,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -1565,7 +1565,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1579,7 +1579,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual char * activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -1594,7 +1594,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -1608,7 +1608,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -1621,7 +1621,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1634,7 +1634,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1647,7 +1647,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual char * server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -1662,7 +1662,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1675,7 +1675,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -1689,7 +1689,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -1728,7 +1728,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1742,7 +1742,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual char * activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -1757,7 +1757,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -1771,7 +1771,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -1784,7 +1784,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1797,7 +1797,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1810,7 +1810,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual char * server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -1825,7 +1825,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -1838,7 +1838,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -1852,7 +1852,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -2142,7 +2142,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual CORBA::Boolean next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -2155,7 +2155,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/base_proxy_impl_ch.cpp:24
virtual void destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -2191,7 +2191,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual CORBA::Boolean next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -2204,7 +2204,7 @@ TAO_NAMESPACE ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 1948cb0040e..7df5ee73b78 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -32,7 +32,7 @@ ImplementationRepository::ServerObject::ServerObject (
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
)
- : CORBA_Object (objref, _tao_collocated, servant)
+ : Object (objref, _tao_collocated, servant)
{
this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
}
@@ -1600,7 +1600,7 @@ ImplementationRepository::Administration::Administration (
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
)
- : CORBA_Object (objref, _tao_collocated, servant)
+ : Object (objref, _tao_collocated, servant)
{
this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
}
@@ -1619,7 +1619,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
)
- : CORBA_Object (objref, _tao_collocated, servant)
+ : Object (objref, _tao_collocated, servant)
{
this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
}
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 09b6887101c..23ba7b864dc 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -570,7 +570,7 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -610,7 +610,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -655,7 +655,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerOb
{}
void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -672,7 +672,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
}
void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -1001,7 +1001,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
)
{
POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_servant;
- CORBA_InterfaceDef_ptr _tao_retval = 0;
+ CORBA::InterfaceDef_ptr _tao_retval = 0;
CORBA::Boolean _tao_result = 0;
TAO_IFR_Client_Adapter *_tao_adapter =
@@ -3040,7 +3040,7 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3084,7 +3084,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -3131,7 +3131,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::act
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -3176,7 +3176,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -3220,7 +3220,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3263,7 +3263,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3306,7 +3306,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -3354,7 +3354,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3397,7 +3397,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -3442,7 +3442,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -3493,7 +3493,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Admini
{}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3514,7 +3514,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
}
char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -3537,7 +3537,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::acti
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -3559,7 +3559,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -3580,7 +3580,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3600,7 +3600,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3620,7 +3620,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo
}
char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -3644,7 +3644,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -3664,7 +3664,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -3686,7 +3686,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
}
void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -5137,7 +5137,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
)
{
POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_servant;
- CORBA_InterfaceDef_ptr _tao_retval = 0;
+ CORBA::InterfaceDef_ptr _tao_retval = 0;
CORBA::Boolean _tao_result = 0;
TAO_IFR_Client_Adapter *_tao_adapter =
@@ -5842,7 +5842,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -5887,7 +5887,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -5932,7 +5932,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
{}
CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -5953,7 +5953,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire
}
void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -6305,7 +6305,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
)
{
POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
- CORBA_InterfaceDef_ptr _tao_retval = 0;
+ CORBA::InterfaceDef_ptr _tao_retval = 0;
CORBA::Boolean _tao_result = 0;
TAO_IFR_Client_Adapter *_tao_adapter =
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 72624f4e987..34891555b47 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -225,7 +225,7 @@ TAO_NAMESPACE POA_ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -236,7 +236,7 @@ TAO_NAMESPACE POA_ImplementationRepository
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -264,7 +264,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void ping (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -275,7 +275,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void shutdown (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -622,7 +622,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -636,7 +636,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual char * activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -651,7 +651,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -665,7 +665,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -678,7 +678,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -691,7 +691,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -704,7 +704,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual char * server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -719,7 +719,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -732,7 +732,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -746,7 +746,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -777,7 +777,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void activate_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -791,7 +791,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual char * activate_server_with_startup (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
CORBA::Long check_startup
ACE_ENV_ARG_DECL
@@ -806,7 +806,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void register_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -820,7 +820,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void reregister_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const ImplementationRepository::StartupOptions & options
ACE_ENV_ARG_DECL
@@ -833,7 +833,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void remove_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -846,7 +846,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void shutdown_server (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -859,7 +859,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual char * server_is_running (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
const char * addr,
ImplementationRepository::ServerObject_ptr server_object
@@ -874,7 +874,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void server_is_shutting_down (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server
ACE_ENV_ARG_DECL
)
@@ -887,7 +887,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void find (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
const char * server,
ImplementationRepository::ServerInformation_out info
ACE_ENV_ARG_DECL
@@ -901,7 +901,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void list (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list,
ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -1089,7 +1089,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual CORBA::Boolean next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -1102,7 +1102,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -1130,7 +1130,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual CORBA::Boolean next_n (
- CORBA_Object *_collocated_tao_target_,
+ CORBA::Object *_collocated_tao_target_,
CORBA::ULong how_many,
ImplementationRepository::ServerInformationList_out server_list
ACE_ENV_ARG_DECL
@@ -1143,7 +1143,7 @@ public:
// be/be_visitor_operation/proxy_impl_xh.cpp:24
virtual void destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp
index 9dcf1405533..15c7c7e640b 100644
--- a/TAO/tao/PortableServer/ORB_Manager.cpp
+++ b/TAO/tao/PortableServer/ORB_Manager.cpp
@@ -311,7 +311,7 @@ TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ORB_ptr
TAO_ORB_Manager::orb (void)
{
- return CORBA_ORB::_duplicate (this->orb_.in ());
+ return CORBA::ORB::_duplicate (this->orb_.in ());
}
// Return the root POA reference
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
index b64abcb390c..f4ae23ee410 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
@@ -51,7 +51,7 @@ TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
PortableInterceptor::AdapterName (
*(this->adapter_name_)),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -72,7 +72,7 @@ TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
PortableInterceptor::AdapterName (
*(this->adapter_name_)),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 51e61927977..cd05ddc4cc5 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -888,7 +888,7 @@ TAO_Object_Adapter_Factory::init (int /* argc */,
ACE_NEW_THROW_EX (temp_orb_initializer,
TAO_PortableServer_ORBInitializer,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index b1896fd4448..22a365e4607 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -1,5 +1,4 @@
-
-/* -*- C++ -*- */
+// -*- C++ -*-
//=============================================================================
/**
@@ -11,23 +10,20 @@
*/
//=============================================================================
-
#ifndef TAO_OBJECT_ADAPTER_H
#define TAO_OBJECT_ADAPTER_H
+
#include "ace/pre.h"
#include "portableserver_export.h"
-#include "Key_Adapters.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "Key_Adapters.h"
#include "poa_macros.h"
-// Servant
-#include "Servant_Base.h"
-
// Active Object Table
#include "Active_Object_Map.h"
@@ -54,6 +50,16 @@
// ****************************************************************
+enum TAO_SERVANT_LOCATION
+{
+ TAO_SERVANT_FOUND,
+ TAO_DEFAULT_SERVANT,
+ TAO_SERVANT_MANAGER,
+ TAO_SERVANT_NOT_FOUND
+};
+
+// ****************************************************************
+
// Forward declaration
class TAO_POA;
class TAO_POA_Manager;
@@ -63,9 +69,9 @@ class TAO_TSS_Resources;
class TAO_Transport;
class TAO_Servant_Dispatcher;
-class TAO_PortableServer_Export TAO_POA_Current :
- public PortableServer::Current,
- public TAO_Local_RefCounted_Object
+class TAO_PortableServer_Export TAO_POA_Current
+ : public PortableServer::Current,
+ public TAO_Local_RefCounted_Object
{
public:
/// Constructor
@@ -872,4 +878,5 @@ ACE_FACTORY_DECLARE (TAO_PortableServer, TAO_Object_Adapter_Factory)
#endif /* __ACE_INLINE__ */
#include "ace/post.h"
+
#endif /* TAO_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index 59d77a9a662..51914597bb6 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -16,12 +16,12 @@
#include "ace/pre.h"
#include "portableserver_export.h"
-#include "tao/corbafwd.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/Abstract_Servant_Base.h"
#include "tao/TAO_Singleton.h"
#include "ace/Synch.h"
#include "ace/Hash_Map_Manager.h"
@@ -139,7 +139,8 @@ private:
*
* @brief Dynamic Hashing scheme for CORBA IDL operation name lookup.
*/
-class TAO_PortableServer_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Dynamic_Hash_OpTable
+ : public TAO_Operation_Table
{
public:
// = Initialization and termination methods.
@@ -191,7 +192,8 @@ private:
* @brief Operation table lookup strategy based on
* linear search. Not efficient, but it works.
*/
-class TAO_PortableServer_Export TAO_Linear_Search_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Linear_Search_OpTable
+ : public TAO_Operation_Table
{
public:
// = Initialization and termination methods.
@@ -246,12 +248,14 @@ public:
* @brief Implements the active demultiplexed lookup strategy. The key is
* assumed to provide an index directly into the internal table.
*/
-class TAO_PortableServer_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Active_Demux_OpTable
+ : public TAO_Operation_Table
{
public:
// = Initialization and termination methods.
/// Initializes the internal table with the database of operations
- TAO_Active_Demux_OpTable (const TAO_operation_db_entry *db, CORBA::ULong dbsize);
+ TAO_Active_Demux_OpTable (const TAO_operation_db_entry *db,
+ CORBA::ULong dbsize);
/// Destructor.
~TAO_Active_Demux_OpTable (void);
@@ -293,7 +297,8 @@ private:
* methods. Subclasses will define the lookup and hash
* functions.
*/
-class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable
+ : public TAO_Operation_Table
{
public:
/// Do nothing constructor.
@@ -322,7 +327,8 @@ private:
virtual unsigned int hash (const char *str, unsigned int len) = 0;
- virtual const TAO_operation_db_entry* lookup (const char *str, unsigned int len) = 0;
+ virtual const TAO_operation_db_entry* lookup (const char *str,
+ unsigned int len) = 0;
};
/**
@@ -336,7 +342,8 @@ private:
* used by 'bind ()' and 'find ()' methods. Subclasses will
* define the lookup method.
*/
-class TAO_PortableServer_Export TAO_Binary_Search_OpTable : public TAO_Operation_Table
+class TAO_PortableServer_Export TAO_Binary_Search_OpTable
+ : public TAO_Operation_Table
{
public:
/// Do nothing constructor.
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index fc203354453..d64877ec69d 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -902,7 +902,7 @@ TAO_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (names,
PortableInterceptor::AdapterName (len),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -1715,7 +1715,7 @@ TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL)
// exception.)
ACE_THROW (
CORBA::TRANSIENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_POA_DISCARDING,
1),
CORBA::COMPLETED_NO));
@@ -1735,7 +1735,7 @@ TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL)
// Since there is no queuing in TAO, we immediately raise a
// TRANSIENT exception.
ACE_THROW (CORBA::TRANSIENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_POA_HOLDING,
1),
CORBA::COMPLETED_NO));
@@ -1756,7 +1756,7 @@ TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL)
// OBJ_ADAPTER system exception, with standard minor code 1, to
// indicate that the object implementation is unavailable.
ACE_THROW (CORBA::OBJ_ADAPTER (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_POA_INACTIVE,
1),
CORBA::COMPLETED_NO));
@@ -3524,8 +3524,8 @@ orbkey:
else
{
ACE_NEW_THROW_EX (tmp,
- CORBA_Object (data,
- collocated),
+ CORBA::Object (data,
+ collocated),
CORBA::INTERNAL ());
ACE_CHECK_RETURN (CORBA::Object::_nil ());
}
@@ -3585,7 +3585,7 @@ TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (tao_info,
TAO_IORInfo (this),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -3946,7 +3946,7 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
ACE_CATCHANY
{
ACE_TRY_THROW (CORBA::TRANSIENT (
- CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+ CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
CORBA::COMPLETED_NO));
}
ACE_ENDTRY;
@@ -3999,7 +3999,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
if (!this->guard_.locked ())
ACE_THROW (
CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_GUARD_FAILURE,
0),
CORBA::COMPLETED_NO));
@@ -4014,7 +4014,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
poa.cleanup_in_progress ())
ACE_THROW (
CORBA::BAD_INV_ORDER (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_POA_BEING_DESTROYED,
0),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 28efcd4fac7..d3e60d5a8c3 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -26,7 +26,7 @@
// Object Adapter
#include "Object_Adapter.h"
-// POA Manager
+// POAManager
#include "POAManager.h"
// POA Policy Set
@@ -41,11 +41,14 @@
// Local Object
#include "tao/LocalObject.h"
+// Portable Interceptor
+#include "tao/PortableInterceptorC.h"
+
// Map
-#include "ace/Hash_Map_Manager.h"
+#include "ace/Hash_Map_Manager_T.h"
-// Vector
-#include "ace/Containers.h"
+// ACE_Array_Base
+#include "ace/Array_Base.h"
// Locking
#include "ace/Synch.h"
@@ -893,7 +896,7 @@ protected:
#endif /* TAO_HAS_MINIMUM_CORBA */
- typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
+ typedef ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
CHILDREN;
CHILDREN children_;
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 4f012c33cde..bb8ad64ba03 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -633,7 +633,7 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_ThruPOA_Proxy_Impl (void)
// ThruPOA Implementation of the IDL interface methods
CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -666,7 +666,7 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
}
::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -699,7 +699,7 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
}
void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -743,7 +743,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
{}
CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -760,7 +760,7 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type (
}
::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -777,7 +777,7 @@ CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type (
}
void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -1120,7 +1120,7 @@ void POA_CORBA::Policy::_interface_skel (
)
{
POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _tao_object_reference;
- CORBA_InterfaceDef_ptr _tao_retval = 0;
+ CORBA::InterfaceDef_ptr _tao_retval = 0;
CORBA::Boolean _tao_result = 0;
TAO_IFR_Client_Adapter *_tao_adapter =
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 1b819c63f3f..acc95374bc7 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -217,7 +217,7 @@ TAO_NAMESPACE POA_CORBA
virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) { }
virtual CORBA::PolicyType policy_type (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -225,7 +225,7 @@ TAO_NAMESPACE POA_CORBA
));
virtual ::CORBA::Policy_ptr copy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -233,7 +233,7 @@ TAO_NAMESPACE POA_CORBA
));
virtual void destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -262,7 +262,7 @@ public:
virtual ~_TAO_Policy_Direct_Proxy_Impl (void) { }
virtual CORBA::PolicyType policy_type (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -270,7 +270,7 @@ public:
));
virtual ::CORBA::Policy_ptr copy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
@@ -278,7 +278,7 @@ public:
));
virtual void destroy (
- CORBA_Object *_collocated_tao_target_
+ CORBA::Object *_collocated_tao_target_
ACE_ENV_ARG_DECL
)
ACE_THROW_SPEC ((
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 205005ecc13..d271de083ab 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -297,7 +297,7 @@ TAO_NAMESPACE_END
// Default constructor.
PortableServer::ForwardRequest::ForwardRequest (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/ForwardRequest:1.0",
"ForwardRequest"
)
@@ -311,7 +311,7 @@ PortableServer::ForwardRequest::~ForwardRequest (void)
// Copy constructor.
PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -323,7 +323,7 @@ PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardR
PortableServer::ForwardRequest&
PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
return *this;
}
@@ -400,7 +400,7 @@ void PortableServer::ForwardRequest::_tao_decode (
PortableServer::ForwardRequest::ForwardRequest (
const CORBA::Object_ptr _tao_forward_reference
)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/ForwardRequest:1.0",
"ForwardRequest"
)
@@ -480,7 +480,7 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
// Default constructor.
PortableServer::NotAGroupObject::NotAGroupObject (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/NotAGroupObject:1.0",
"NotAGroupObject"
)
@@ -494,7 +494,7 @@ PortableServer::NotAGroupObject::~NotAGroupObject (void)
// Copy constructor.
PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -505,7 +505,7 @@ PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGr
PortableServer::NotAGroupObject&
PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObject &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -3678,7 +3678,7 @@ const char* PortableServer::POAManager::_interface_repository_id (void) const
// Default constructor.
PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0",
"AdapterInactive"
)
@@ -3692,7 +3692,7 @@ PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
// Copy constructor.
PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -3703,7 +3703,7 @@ PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableSe
PortableServer::POAManager::AdapterInactive&
PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5294,7 +5294,7 @@ const char* PortableServer::POA::_interface_repository_id (void) const
// Default constructor.
PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0",
"AdapterAlreadyExists"
)
@@ -5308,7 +5308,7 @@ PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
// Copy constructor.
PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5319,7 +5319,7 @@ PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::Portabl
PortableServer::POA::AdapterAlreadyExists&
PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5378,7 +5378,7 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
// Default constructor.
PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0",
"AdapterNonExistent"
)
@@ -5392,7 +5392,7 @@ PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
// Copy constructor.
PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5403,7 +5403,7 @@ PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableSer
PortableServer::POA::AdapterNonExistent&
PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5462,7 +5462,7 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (
// Default constructor.
PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
"InvalidPolicy"
)
@@ -5476,7 +5476,7 @@ PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
// Copy constructor.
PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5488,7 +5488,7 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::
PortableServer::POA::InvalidPolicy&
PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
this->index = _tao_excp.index;
return *this;
}
@@ -5549,7 +5549,7 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (
PortableServer::POA::InvalidPolicy::InvalidPolicy (
CORBA::UShort _tao_index
)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0",
"InvalidPolicy"
)
@@ -5561,7 +5561,7 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (
// Default constructor.
PortableServer::POA::NoServant::NoServant (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/NoServant:1.0",
"NoServant"
)
@@ -5575,7 +5575,7 @@ PortableServer::POA::NoServant::~NoServant (void)
// Copy constructor.
PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5586,7 +5586,7 @@ PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServan
PortableServer::POA::NoServant&
PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5647,7 +5647,7 @@ void PortableServer::POA::NoServant::_tao_decode (
// Default constructor.
PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0",
"ObjectAlreadyActive"
)
@@ -5661,7 +5661,7 @@ PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
// Copy constructor.
PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5672,7 +5672,7 @@ PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableS
PortableServer::POA::ObjectAlreadyActive&
PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5731,7 +5731,7 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
// Default constructor.
PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0",
"ObjectNotActive"
)
@@ -5745,7 +5745,7 @@ PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
// Copy constructor.
PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5756,7 +5756,7 @@ PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::P
PortableServer::POA::ObjectNotActive&
PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5815,7 +5815,7 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (
// Default constructor.
PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0",
"ServantAlreadyActive"
)
@@ -5829,7 +5829,7 @@ PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
// Copy constructor.
PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5840,7 +5840,7 @@ PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::Portabl
PortableServer::POA::ServantAlreadyActive&
PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5899,7 +5899,7 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (
// Default constructor.
PortableServer::POA::ServantNotActive::ServantNotActive (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/ServantNotActive:1.0",
"ServantNotActive"
)
@@ -5913,7 +5913,7 @@ PortableServer::POA::ServantNotActive::~ServantNotActive (void)
// Copy constructor.
PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -5924,7 +5924,7 @@ PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer:
PortableServer::POA::ServantNotActive&
PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5983,7 +5983,7 @@ void PortableServer::POA::ServantNotActive::_tao_decode (
// Default constructor.
PortableServer::POA::WrongAdapter::WrongAdapter (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/WrongAdapter:1.0",
"WrongAdapter"
)
@@ -5997,7 +5997,7 @@ PortableServer::POA::WrongAdapter::~WrongAdapter (void)
// Copy constructor.
PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -6008,7 +6008,7 @@ PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::Wr
PortableServer::POA::WrongAdapter&
PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -6067,7 +6067,7 @@ void PortableServer::POA::WrongAdapter::_tao_decode (
// Default constructor.
PortableServer::POA::WrongPolicy::WrongPolicy (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/POA/WrongPolicy:1.0",
"WrongPolicy"
)
@@ -6081,7 +6081,7 @@ PortableServer::POA::WrongPolicy::~WrongPolicy (void)
// Copy constructor.
PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -6092,7 +6092,7 @@ PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::Wron
PortableServer::POA::WrongPolicy&
PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -6464,7 +6464,7 @@ const char* PortableServer::Current::_interface_repository_id (void) const
// Default constructor.
PortableServer::Current::NoContext::NoContext (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/PortableServer/Current/NoContext:1.0",
"NoContext"
)
@@ -6478,7 +6478,7 @@ PortableServer::Current::NoContext::~NoContext (void)
// Copy constructor.
PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -6489,7 +6489,7 @@ PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::
PortableServer::Current::NoContext&
PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index d654972f389..05bcbcc9a8b 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -200,10 +200,10 @@ TAO_NAMESPACE PortableServer
virtual void _downcast (
void* target,
- CORBA_Object *src
+ CORBA::Object *src
ACE_ENV_ARG_DECL_WITH_DEFAULTS
);
- virtual CORBA_Object* _upcast (void *src) const;
+ virtual CORBA::Object* _upcast (void *src) const;
};
#endif /* end #if !defined */
@@ -1833,7 +1833,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
#define _PORTABLESERVER_POAMANAGER_CH_
class TAO_PortableServer_Export POAManager
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2058,7 +2058,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
#define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
class TAO_PortableServer_Export AdapterActivator
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2196,7 +2196,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
#define _PORTABLESERVER_SERVANTMANAGER_CH_
class TAO_PortableServer_Export ServantManager
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2645,7 +2645,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
#define _PORTABLESERVER_POA_CH_
class TAO_PortableServer_Export POA
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index ad32233d67a..eae00f394d4 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "Servant_Base.h"
#include "POA.h"
#include "Operation_Table.h"
@@ -90,7 +88,7 @@ TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
return 0;
}
-CORBA_InterfaceDef_ptr
+CORBA::InterfaceDef_ptr
TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
{
TAO_IFR_Client_Adapter *adapter =
@@ -204,7 +202,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
// Fetch the skeleton for this operation
if (this->_find (opname, skel, req.operation_length()) == -1)
{
- ACE_THROW (CORBA_BAD_OPERATION());
+ ACE_THROW (CORBA::BAD_OPERATION ());
}
CORBA::Boolean send_reply = !req.sync_with_server ()
@@ -259,7 +257,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest &req,
// the appropriate reply to the client
if (send_reply)
{
- req.tao_send_reply_exception(ex);
+ req.tao_send_reply_exception (ex);
}
}
ACE_ENDTRY;
@@ -289,7 +287,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest &req,
// Fetch the skeleton for this operation
if (this->_find (opname, skel, req.operation_length()) == -1)
{
- ACE_THROW (CORBA_BAD_OPERATION());
+ ACE_THROW (CORBA::BAD_OPERATION ());
}
ACE_TRY
@@ -357,7 +355,7 @@ TAO_RefCountServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
void
TAO_RefCountServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
{
- CORBA::ULong new_count = --this->ref_count_;
+ const CORBA::ULong new_count = --this->ref_count_;
if (new_count == 0)
{
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index b04fcfc0cbc..6c4a47ea519 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -30,7 +30,8 @@ class TAO_Operation_Table;
*
* @brief Base class for skeletons and servants.
*
- * The POA spec requires that all servants inherit from this class.
+ * The POA spec requires that all servants inherit from this class'
+ * base class.
*/
class TAO_PortableServer_Export TAO_ServantBase
: public virtual TAO_Abstract_ServantBase
@@ -38,7 +39,6 @@ class TAO_PortableServer_Export TAO_ServantBase
public:
friend class TAO_POA;
friend class TAO_Object_Adapter;
- friend class CORBA_Object;
friend class TAO_Local_ServantBase;
/// Destructor.
@@ -59,11 +59,12 @@ public:
);
/// Query the Interface Repository for the interface definition.
- virtual CORBA_InterfaceDef_ptr _get_interface (
- ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual CORBA::InterfaceDef_ptr _get_interface (
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- /// Default <_get_component>: always returns CORBA::Object::_nil().
- virtual CORBA::Object_ptr _get_component (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ /// Default @c _get_component>: always returns CORBA::Object::_nil().
+ virtual CORBA::Object_ptr _get_component (
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
/// Get the correct vtable.
virtual void *_downcast (const char *repository_id) = 0;
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
index b862fca42d2..43b54df9cf2 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
@@ -126,7 +126,7 @@ send_reply (TAO_ServerRequestInfo *ri
// interception point.
// Unwind the stack.
- size_t len = this->stack_size_;
+ const size_t len = this->stack_size_;
for (size_t i = 0; i < len; ++i)
{
// Pop the interceptor off of the flow stack before it is
@@ -161,7 +161,7 @@ send_exception (TAO_ServerRequestInfo *ri
ACE_TRY
{
// Unwind the flow stack.
- size_t len = this->stack_size_;
+ const size_t len = this->stack_size_;
for (size_t i = 0; i < len; ++i)
{
// Pop the interceptor off of the flow stack before it is
@@ -232,7 +232,7 @@ send_other (TAO_ServerRequestInfo *ri
ACE_TRY
{
// Unwind the flow stack.
- size_t len = this->stack_size_;
+ const size_t len = this->stack_size_;
for (size_t i = 0; i < len; ++i)
{
// Pop the interceptor off of the flow stack before it is
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 9bf6265b259..fe3d7d44b69 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -274,7 +274,7 @@ TAO_ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
ACE_NEW_THROW_EX (temp,
CORBA::Any,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
index 46a86fd4d89..cdcf0596013 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
@@ -86,7 +86,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
return _tao_retval;
}
-CORBA_InterfaceDef_ptr
+CORBA::InterfaceDef_ptr
TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
ACE_ENV_ARG_DECL)
{
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
index 308a42cb11f..f90bfacf09e 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
//=============================================================================
/**
@@ -55,7 +56,7 @@ public:
virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
ACE_ENV_ARG_DECL);
- virtual CORBA_InterfaceDef_ptr _get_interface (
+ virtual CORBA::InterfaceDef_ptr _get_interface (
const CORBA::Object_ptr target
ACE_ENV_ARG_DECL
);
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index a2735761762..2860a202041 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -13,7 +13,10 @@
#include "Profile.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(tao, Profile, "$Id$")
+
+ACE_RCSID (tao,
+ Profile,
+ "$Id$")
// ****************************************************************
@@ -36,7 +39,10 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component
// ----------------------------------------------------------------
// Add the given tagged component to this profile.
- this->tagged_components ().set_component (component);
+ //
+ // Note that multiple tagged profiles with the same tag value may be
+ // added, unless the tagged component is known to be unique by TAO.
+ this->tagged_components_.set_component (component);
}
void
@@ -63,7 +69,8 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
// This loop iterates through CORBA::PolicyList to convert
// each CORBA::Policy into a CORBA::PolicyValue
- for (size_t i = 0; i < policy_list->length (); ++i)
+ const size_t plen = policy_list->length ();
+ for (size_t i = 0; i < plen; ++i)
{
TAO_OutputCDR out_CDR;
policy_value_seq[i].ptype =
@@ -78,7 +85,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
buf = policy_value_seq[i].pvalue.get_buffer ();
- // Copy the CDR buffer data into the sequence<octect> buffer.
+ // Copy the CDR buffer data into the octet sequence buffer.
for (const ACE_Message_Block *iterator = out_CDR.begin ();
iterator != 0;
@@ -277,7 +284,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL)
// @todo: We need the proper minor code as soon as the spec is
// updated.
ACE_THROW (CORBA::BAD_PARAM (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -306,7 +313,7 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL)
// @todo: We need the proper minor code as soon as the spec is
// updated.
ACE_THROW (CORBA::BAD_PARAM (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -336,7 +343,7 @@ TAO_Profile::addressing_mode (CORBA::Short addr
default:
ACE_THROW (CORBA::BAD_PARAM (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -350,7 +357,8 @@ TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag,
TAO_ORB_Core *orb_core)
: TAO_Profile (tag,
orb_core,
- TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
+ TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR,
+ TAO_DEF_GIOP_MINOR)),
tagged_profile_ ()
{
}
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 86500c9aa7f..55dc110abab 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -5337,8 +5337,8 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const
// Default constructor.
RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
- : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
- "MutexNotFound")
+ : CORBA::UserException ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0",
+ "MutexNotFound")
{
}
@@ -5349,8 +5349,8 @@ RTCORBA::RTORB::MutexNotFound::~MutexNotFound (void)
// Copy constructor.
RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id () ,
- _tao_excp._name ()
+ : CORBA::UserException (_tao_excp._rep_id () ,
+ _tao_excp._name ()
)
{
}
@@ -5359,7 +5359,7 @@ RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFo
RTCORBA::RTORB::MutexNotFound&
RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
@@ -5418,9 +5418,9 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode (
// Default constructor.
RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
- : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
- "InvalidThreadpool"
- )
+ : CORBA::UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0",
+ "InvalidThreadpool"
+ )
{
}
@@ -5431,8 +5431,8 @@ RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void)
// Copy constructor.
RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
- : CORBA_UserException (_tao_excp._rep_id (),
- _tao_excp._name ()
+ : CORBA::UserException (_tao_excp._rep_id (),
+ _tao_excp._name ()
)
{
}
@@ -5441,7 +5441,7 @@ RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::In
RTCORBA::RTORB::InvalidThreadpool&
RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index bca83e97ec9..aeed8da14e8 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -706,7 +706,7 @@ TAO_NAMESPACE RTCORBA
#define _RTCORBA_PROTOCOLPROPERTIES_CH_
class TAO_RTCORBA_Export ProtocolProperties
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
, public TAO_Encodable
{
public:
@@ -2675,7 +2675,7 @@ TAO_NAMESPACE RTCORBA
#define _RTCORBA_MUTEX_CH_
class TAO_RTCORBA_Export Mutex
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2828,7 +2828,7 @@ TAO_NAMESPACE RTCORBA
#define _RTCORBA_RTORB_CH_
class TAO_RTCORBA_Export RTORB
- : public virtual CORBA_Object
+ : public virtual CORBA::Object
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 4d840fb6311..aedc5479886 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
#include "RT_Invocation_Endpoint_Selectors.h"
#if !defined (__ACE_INLINE__)
@@ -18,27 +16,35 @@
#include "RT_Protocols_Hooks.h"
#include "tao/debug.h"
-ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$")
+
+ACE_RCSID (RTCORBA,
+ RT_Invocation_Endpoint_Selectors,
+ "$Id$")
+
void
-TAO_RT_Invocation_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
- ACE_ENV_ARG_DECL)
+TAO_RT_Invocation_Endpoint_Selector::select_endpoint (
+ TAO_GIOP_Invocation *invocation
+ ACE_ENV_ARG_DECL)
{
CORBA::Policy_var client_protocol_policy_base =
- TAO_RT_Endpoint_Utils::client_protocol_policy (invocation ACE_ENV_ARG_PARAMETER);
+ TAO_RT_Endpoint_Utils::client_protocol_policy (invocation
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (client_protocol_policy_base.ptr () == 0)
{
- this->TAO_Default_Endpoint_Selector::select_endpoint (invocation
- ACE_ENV_ARG_PARAMETER);
+ this->TAO_Default_Endpoint_Selector::select_endpoint (
+ invocation
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
else
{
RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
- RTCORBA::ClientProtocolPolicy::_narrow (client_protocol_policy_base.in ()
- ACE_ENV_ARG_PARAMETER);
+ RTCORBA::ClientProtocolPolicy::_narrow (
+ client_protocol_policy_base.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
/// Cast to TAO_ClientProtocolPolicy
@@ -50,19 +56,21 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invoc
RTCORBA::ProtocolList &client_protocols =
tao_client_protocol_policy->protocols_rep ();
- this->select_endpoint_based_on_client_protocol_policy (invocation,
- client_protocol_policy.in (),
- client_protocols
- ACE_ENV_ARG_PARAMETER);
+ this->select_endpoint_based_on_client_protocol_policy (
+ invocation,
+ client_protocol_policy.in (),
+ client_protocols
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
}
void
-TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_policy (TAO_GIOP_Invocation *invocation,
- RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy,
- RTCORBA::ProtocolList &client_protocols
- ACE_ENV_ARG_DECL)
+TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_policy (
+ TAO_GIOP_Invocation *invocation,
+ RTCORBA::ClientProtocolPolicy_ptr client_protocol_policy,
+ RTCORBA::ProtocolList &client_protocols
+ ACE_ENV_ARG_DECL)
{
CORBA::Boolean valid_profile_found = 0;
@@ -95,7 +103,8 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
invocation->endpoint (invocation->profile ()->endpoint ());
int status =
- this->endpoint_from_profile (invocation ACE_ENV_ARG_PARAMETER);
+ this->endpoint_from_profile (invocation
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (status == 1)
@@ -126,8 +135,9 @@ TAO_RT_Invocation_Endpoint_Selector::select_endpoint_based_on_client_protocol_po
}
int
-TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (TAO_GIOP_Invocation *invocation
- ACE_ENV_ARG_DECL)
+TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
+ TAO_GIOP_Invocation *invocation
+ ACE_ENV_ARG_DECL)
{
// Narrow to the RT Stub.
TAO_RT_Stub *rt_stub =
@@ -138,7 +148,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (TAO_GIOP_Invocation
ACE_DEBUG ((LM_DEBUG, "Unexpected error narrowing stub to TAO_RT_Stub"));
ACE_THROW_RETURN (CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
@@ -210,12 +220,13 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (TAO_GIOP_Invocation
{
// Get client thread priority.
int status =
- protocol_hooks->get_thread_CORBA_priority (client_thread_priority // side effect
- ACE_ENV_ARG_PARAMETER);
+ protocol_hooks->get_thread_CORBA_priority (
+ client_thread_priority // side effect
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
if (status == -1)
{
- ACE_THROW_RETURN (CORBA::DATA_CONVERSION (1,
+ ACE_THROW_RETURN (CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
CORBA::COMPLETED_NO),
0);
}
@@ -232,11 +243,12 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (TAO_GIOP_Invocation
{
// Check which band range we fall in.
int in_range = 0;
- protocol_hooks->get_selector_bands_policy_hook (bands_policy.in (),
- client_thread_priority,
- min_priority,
- max_priority,
- in_range);
+ protocol_hooks->get_selector_bands_policy_hook (
+ bands_policy.in (),
+ client_thread_priority,
+ min_priority,
+ max_priority,
+ in_range);
// If priority doesn't fall into any of the bands.
if (!in_range)
@@ -247,7 +259,8 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (TAO_GIOP_Invocation
invocation->inconsistent_policies ()[0u] =
CORBA::Policy::_duplicate (bands_policy.in ());
invocation->inconsistent_policies ()[1u] =
- CORBA::Policy::_duplicate (priority_model_policy.in ());
+ CORBA::Policy::_duplicate (
+ priority_model_policy.in ());
}
// Indicate error.
@@ -289,19 +302,23 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (TAO_GIOP_Invocation
int status;
if (rt_stub->private_connection ())
{
- TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
- ACE_reinterpret_cast (long, invocation->stub ()));
+ TAO_Private_Transport_Descriptor private_desc (
+ invocation->endpoint (),
+ ACE_reinterpret_cast (long, invocation->stub ()));
status =
- invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER);
+ invocation->perform_call (private_desc
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
}
else
{
- TAO_Base_Transport_Property default_desc (invocation->endpoint ());
+ TAO_Base_Transport_Property default_desc (
+ invocation->endpoint ());
status =
- invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER);
+ invocation->perform_call (default_desc
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
}
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 586001c7399..e96962f67f8 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -1,14 +1,13 @@
-
-// $Id$
-
#include "RT_ORB_Loader.h"
#include "RT_ORBInitializer.h"
#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORBInitializer_Registry.h"
-ACE_RCSID (TAO, RT_ORB_Loader, "$Id$")
+
+ACE_RCSID (RTCORBA,
+ RT_ORB_Loader,
+ "$Id$")
+
TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
{
@@ -33,8 +32,10 @@ TAO_RT_ORB_Loader::init (int argc,
initialized = 1;
// Set defaults.
- int priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
- int network_priority_mapping_type = TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
+ int priority_mapping_type =
+ TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
+ int network_priority_mapping_type =
+ TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
long sched_policy = -1;
long scope_policy = THR_SCOPE_PROCESS;
int curarg = 0;
@@ -51,13 +52,16 @@ TAO_RT_ORB_Loader::init (int argc,
if (ACE_OS::strcasecmp (name,
ACE_LIB_TEXT("continuous")) == 0)
- priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS;
+ priority_mapping_type =
+ TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_CONTINUOUS;
else if (ACE_OS::strcasecmp (name,
ACE_LIB_TEXT("linear")) == 0)
- priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR;
+ priority_mapping_type =
+ TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_LINEAR;
else if (ACE_OS::strcasecmp (name,
ACE_LIB_TEXT("direct")) == 0)
- priority_mapping_type = TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
+ priority_mapping_type =
+ TAO_RT_ORBInitializer::TAO_PRIORITY_MAPPING_DIRECT;
else
ACE_DEBUG ((LM_DEBUG,
ACE_LIB_TEXT("RT_ORB_Loader - unknown argument")
@@ -120,7 +124,8 @@ TAO_RT_ORB_Loader::init (int argc,
if (ACE_OS::strcasecmp (name,
ACE_LIB_TEXT("linear")) == 0)
- network_priority_mapping_type = TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
+ network_priority_mapping_type =
+ TAO_RT_ORBInitializer::TAO_NETWORK_PRIORITY_MAPPING_LINEAR;
}
}
else
@@ -154,7 +159,7 @@ TAO_RT_ORB_Loader::init (int argc,
sched_policy,
scope_policy),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -168,7 +173,8 @@ TAO_RT_ORB_Loader::init (int argc,
ACE_CATCHANY
{
ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Unexpected exception caught while initializing the RTORB:");
+ "Unexpected exception caught while "
+ "initializing the RTORB");
return 1;
}
ACE_ENDTRY;
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 086b162c0b6..e64202155c6 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -60,7 +60,7 @@ TAO_RT_PolicyFactory::_create_policy (
ACE_NEW_THROW_EX (policy,
TAO_PriorityModelPolicy,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -74,7 +74,7 @@ TAO_RT_PolicyFactory::_create_policy (
ACE_NEW_THROW_EX (policy,
TAO_PriorityBandedConnectionPolicy,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
@@ -88,7 +88,7 @@ TAO_RT_PolicyFactory::_create_policy (
ACE_NEW_THROW_EX (policy,
TAO_ClientProtocolPolicy,
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index 5301a0550f6..3d86903c910 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -47,7 +47,7 @@ public:
void finalize (void);
/// Open default resources.
- int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ int open_default_resources (ACE_ENV_SINGLE_ARG_DECL);
/// Shutdown reactor.
void shutdown_reactor (void);
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 2490ca8ef21..f99ca6a6bb5 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -1,8 +1,8 @@
-// $Id$
-
#include "Thread_Pool.h"
-ACE_RCSID(tao, Thread_Pool, "$Id$")
+ACE_RCSID (RTCORBA,
+ Thread_Pool,
+ "$Id$")
#include "tao/Exception.h"
#include "ace/Auto_Ptr.h"
@@ -17,7 +17,9 @@ ACE_RCSID(tao, Thread_Pool, "$Id$")
# include "Thread_Pool.i"
#endif /* ! __ACE_INLINE__ */
-TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (TAO_Thread_Lane &lane)
+
+TAO_RT_New_Leader_Generator::TAO_RT_New_Leader_Generator (
+ TAO_Thread_Lane &lane)
: lane_ (lane)
{
}
@@ -51,7 +53,8 @@ TAO_RT_New_Leader_Generator::no_leaders_available (void)
if (TAO_debug_level > 0)
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("TAO Process %P Pool %d Lane %d Thread %t\n")
- ACE_TEXT ("Current number of threads = %d; static threads = %d; dynamic threads = %d\n")
+ ACE_TEXT ("Current number of threads = %d; ")
+ ACE_TEXT ("static threads = %d; dynamic threads = %d\n")
ACE_TEXT ("No leaders available; creating new leader!\n"),
this->lane_.pool ().id (),
this->lane_.id (),
@@ -211,7 +214,7 @@ TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL)
if (result == -1)
ACE_THROW (CORBA::INTERNAL (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE,
0),
CORBA::COMPLETED_NO));
@@ -604,7 +607,7 @@ TAO_Thread_Pool::number_of_lanes (void) const
mon, \
this->lock_, \
CORBA::INTERNAL ( \
- CORBA_SystemException::_tao_minor_code ( \
+ CORBA::SystemException::_tao_minor_code ( \
TAO_GUARD_FAILURE, \
0), \
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index b0f2d3a5b7b..cf44e014a3c 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -1,4 +1,4 @@
-//-*- C++ -*-
+// -*- C++ -*-
//=============================================================================
/**
@@ -21,6 +21,8 @@
#include "tao/IOPC.h"
+class TAO_ServerRequest;
+
/**
* @class TAO_Request_Dispatcher
*
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index bf14b7d224a..838485381f1 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -25,14 +25,14 @@ void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
void
TAO_Base_Sequence::_downcast (void*,
- CORBA_Object*
+ CORBA::Object*
ACE_ENV_ARG_DECL_NOT_USED)
{
// default is no op.
// @@ TODO Maybe throw an exception?
}
-CORBA_Object*
+CORBA::Object*
TAO_Base_Sequence::_upcast (void*) const
{
return 0;
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index dece80234c5..241c7ecf5fb 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -779,7 +779,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
template <class T, class T_var> void
TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
- CORBA_Object* src
+ CORBA::Object* src
ACE_ENV_ARG_DECL)
{
T **tmp = ACE_static_cast (T**,
@@ -791,7 +791,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
ACE_CHECK;
}
-template <class T, class T_var> CORBA_Object*
+template <class T, class T_var> CORBA::Object*
TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
{
return T_var::tao_upcast (src);
@@ -961,7 +961,7 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
template <class T, class T_var, size_t MAX> void
TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
- CORBA_Object* src
+ CORBA::Object* src
ACE_ENV_ARG_DECL)
{
T **tmp = ACE_static_cast (T**,
@@ -973,7 +973,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
ACE_CHECK;
}
-template <class T, class T_var, size_t MAX> CORBA_Object*
+template <class T, class T_var, size_t MAX> CORBA::Object*
TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
{
return T_var::tao_upcast (src);
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 466db7d48c3..8999044018c 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -742,9 +742,9 @@ public:
virtual void _shrink_buffer (CORBA::ULong new_length,
CORBA::ULong old_length);
virtual void _downcast (void* target,
- CORBA_Object* src
+ CORBA::Object* src
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
- virtual CORBA_Object* _upcast (void* src) const;
+ virtual CORBA::Object* _upcast (void* src) const;
};
// *************************************************************
@@ -803,9 +803,9 @@ public:
virtual void _shrink_buffer (CORBA::ULong new_length,
CORBA::ULong old_length);
virtual void _downcast (void* target,
- CORBA_Object* src
+ CORBA::Object* src
ACE_ENV_ARG_DECL_WITH_DEFAULTS);
- virtual CORBA_Object* _upcast (void* src) const;
+ virtual CORBA::Object* _upcast (void* src) const;
};
// *************************************************************
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index 09a7467ef57..def615b2bae 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,4 +1,3 @@
-//$Id$
#include "tao/Service_Callbacks.h"
#include "tao/PolicyC.h"
@@ -6,7 +5,10 @@
# include "tao/Service_Callbacks.i"
#endif /* ! __ACE_INLINE__ */
-ACE_RCSID(tao, Service_Callbacks, "$Id$")
+
+ACE_RCSID (tao,
+ Service_Callbacks,
+ "$Id$")
TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
@@ -44,10 +46,11 @@ TAO_Service_Callbacks::reset_profile_flags (void)
void
-TAO_Service_Callbacks::service_context_list (TAO_Stub *& /*stub*/ ,
- IOP::ServiceContextList & /*service_list*/,
- CORBA::Boolean
- ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Service_Callbacks::service_context_list (
+ TAO_Stub *& /*stub*/ ,
+ IOP::ServiceContextList & /*service_list*/,
+ CORBA::Boolean
+ ACE_ENV_ARG_DECL_NOT_USED)
{
return;
}
@@ -59,7 +62,7 @@ TAO_Service_Callbacks::raise_comm_failure (
ACE_ENV_ARG_DECL)
{
ACE_THROW_RETURN (CORBA::COMM_FAILURE (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
errno),
CORBA::COMPLETED_MAYBE),
@@ -73,7 +76,7 @@ TAO_Service_Callbacks::raise_transient_failure (
ACE_ENV_ARG_DECL)
{
ACE_THROW_RETURN (CORBA::TRANSIENT (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
errno),
CORBA::COMPLETED_MAYBE),
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 41401ee8b9c..27c3457526f 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -168,7 +168,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
if (!ior || !*ior)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -200,7 +200,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
this->version_.minor > TAO_DEF_GIOP_MINOR)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -215,7 +215,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
{
// No object key delimiter or no hostname specified.
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -230,7 +230,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
{
// No hostname specified! It is required by the spec.
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -284,7 +284,7 @@ TAO_DIOP_Profile::parse_string (const char *ior
// @@ What's the right exception to throw here?
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 99bb7f2f3b8..dd0cca3adec 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -181,7 +181,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
if (!string || !*string)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -208,7 +208,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
this->version_.minor > TAO_DEF_GIOP_MINOR)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -225,7 +225,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
{
// No host/port delimiter!
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -237,7 +237,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
{
// No object key delimiter!
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -287,7 +287,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
// @@ What's the right exception to throw here?
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -313,7 +313,7 @@ TAO_SHMIOP_Profile::parse_string (const char *string
// @@ What's the right exception to throw here?
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 769dca3b406..21ebcdf9639 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -103,7 +103,7 @@ TAO_UIOP_Profile::parse_string (const char *string
if (!string || !*string)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -130,7 +130,7 @@ TAO_UIOP_Profile::parse_string (const char *string
this->version_.minor > TAO_DEF_GIOP_MINOR)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -146,7 +146,7 @@ TAO_UIOP_Profile::parse_string (const char *string
if (cp == 0)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
@@ -163,7 +163,7 @@ TAO_UIOP_Profile::parse_string (const char *string
if (this->endpoint_.object_addr_.set (rendezvous.in ()) != 0)
{
ACE_THROW (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO));
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index daa44db3527..902dd6a1dff 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -184,10 +184,10 @@ public:
/**
* @note Deprecated in CORBA 2.4
*/
- // void requesting_principal (CORBA_Principal_ptr principal);
+ // void requesting_principal (CORBA::Principal_ptr principal);
/// Set the requesting principal
- void requesting_principal (const CORBA_OctetSeq & principal);
+ void requesting_principal (const CORBA::OctetSeq & principal);
/// Return the reference to the tagged profile
TAO_Tagged_Profile &profile (void);
@@ -273,7 +273,7 @@ private:
TAO_Tagged_Profile profile_;
/// Identifies the requester.
- CORBA_OctetSeq_var requesting_principal_;
+ CORBA::OctetSeq_var requesting_principal_;
/// Did we get passed to a CORBA::ServerRequest?
CORBA::Boolean is_dsi_;
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 2f68925135c..7552a3e7a24 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -1,4 +1,5 @@
// -*- C++ -*-
+//
// $Id$
ACE_INLINE TAO_ORB_Core *
@@ -128,7 +129,7 @@ TAO_ServerRequest::request_id (CORBA::ULong req)
}
ACE_INLINE void
-TAO_ServerRequest::requesting_principal (const CORBA_OctetSeq &principal)
+TAO_ServerRequest::requesting_principal (const CORBA::OctetSeq &principal)
{
this->requesting_principal_ = principal;
}
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index 2e65ddcd221..e3b4a899c2a 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -51,7 +51,7 @@ TAO_Connector::make_mprofile (const char *string,
if (!string || !*string)
{
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
EINVAL),
CORBA::COMPLETED_NO),
@@ -128,7 +128,7 @@ TAO_Connector::make_mprofile (const char *string,
if (mprofile.set (profile_count) != ACE_static_cast (int, profile_count))
{
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_MPROFILE_CREATION_ERROR,
0),
CORBA::COMPLETED_NO),
@@ -188,7 +188,7 @@ TAO_Connector::make_mprofile (const char *string,
profile->_decr_refcnt ();
ACE_THROW_RETURN (CORBA::INV_OBJREF (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_MPROFILE_CREATION_ERROR,
0),
CORBA::COMPLETED_NO),
@@ -234,8 +234,9 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation,
// If transport found, reference count is incremented on assignment
// @@todo: We need to send the timeout value to the cache registry
// too. That should be the next step!
- if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (desc,
- base_transport) == 0)
+ if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (
+ desc,
+ base_transport) == 0)
{
if (TAO_debug_level > 2)
ACE_DEBUG ((LM_DEBUG,
@@ -250,7 +251,7 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation,
// base_transport.
transport = base_transport;
- // Successfull
+ // Successful
return 0;
}
@@ -270,7 +271,8 @@ TAO_Connector::create_connect_strategy (void)
if (this->active_connect_strategy_ == 0)
{
this->active_connect_strategy_ =
- this->orb_core_->client_factory ()->create_connect_strategy (this->orb_core_);
+ this->orb_core_->client_factory ()->create_connect_strategy (
+ this->orb_core_);
}
if (this->active_connect_strategy_ == 0)
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 9ee1b83d448..1dc563422a4 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -40,7 +40,7 @@ public:
virtual CORBA::TypeCode_ptr create_struct_tc (
const char *id,
const char *name,
- const CORBA_StructMemberSeq &members
+ const CORBA::StructMemberSeq &members
ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
@@ -49,7 +49,7 @@ public:
const char *id,
const char *name,
CORBA::TypeCode_ptr discriminator_type,
- const CORBA_UnionMemberSeq &members
+ const CORBA::UnionMemberSeq &members
ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
@@ -57,7 +57,7 @@ public:
virtual CORBA::TypeCode_ptr create_enum_tc (
const char *id,
const char *name,
- const CORBA_EnumMemberSeq &members
+ const CORBA::EnumMemberSeq &members
ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
@@ -73,7 +73,7 @@ public:
virtual CORBA::TypeCode_ptr create_exception_tc (
const char *id,
const char *name,
- const CORBA_StructMemberSeq &members
+ const CORBA::StructMemberSeq &members
ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
@@ -123,7 +123,7 @@ public:
const char *name,
CORBA::ValueModifier type_modifier,
CORBA::TypeCode_ptr concrete_base,
- const CORBA_ValueMemberSeq &members
+ const CORBA::ValueMemberSeq &members
ACE_ENV_ARG_DECL_WITH_DEFAULTS
)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 0047bc59a12..19cce16c767 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -43,7 +43,7 @@
// Default constructor.
CORBA::WrongTransaction::WrongTransaction (void)
- : CORBA_UserException (
+ : CORBA::UserException (
"IDL:omg.org/CORBA/WrongTransaction:1.0",
"WrongTransaction"
)
@@ -57,7 +57,7 @@ CORBA::WrongTransaction::~WrongTransaction (void)
// Copy constructor.
CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp)
- : CORBA_UserException (
+ : CORBA::UserException (
_tao_excp._rep_id (),
_tao_excp._name ()
)
@@ -68,7 +68,7 @@ CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao
CORBA::WrongTransaction&
CORBA::WrongTransaction::operator= (const ::CORBA::WrongTransaction &_tao_excp)
{
- this->CORBA_UserException::operator= (_tao_excp);
+ this->UserException::operator= (_tao_excp);
return *this;
}
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 3d337243719..31b9a3ddbbe 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -47,6 +47,7 @@
#include "tao/LocalObject.h"
#include "tao/Principal.h"
#include "tao/ORB.h"
+#include "tao/varbase.h"
#include "tao/CurrentC.h"
#include "tao/BoundsC.h"
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 57363e4fc52..b0a87907632 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -8,15 +8,15 @@
*
* Forward declare the basic types used in the ORB
* implementation. Regular users of the ORB should only include
- * tao/corba.h, but the implementation of the ORB itself should
- * include this file. That reduces interdependency and speed up
- * compilations and recompilations.
- *
+ * tao/corba.h (generally through the stub/skeleton headers), but the
+ * implementation of the ORB itself should include this file. That
+ * reduces interdependency and speeds up compilations and
+ * recompilations.
*
* @author Carlos O'Ryan
* @author Chris Cleeland
* @author Douglas C. Schmidt
- * @author Copyright 1994-1995 by Sun Microsystems Inc.
+ * @author Ossama Othman
*/
//=============================================================================
@@ -40,11 +40,10 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ace/CORBA_macros.h"
#include "tao/orbconf.h"
-#include "tao/varbase.h"
#include "tao/TAO_Export.h"
+
#if defined (_MSC_VER) || defined (__BORLANDC__)
# ifdef _DEBUG /* convert from VC++ convention ... */
# define TAO_DEBUG /* ... to normal convention */
@@ -63,9 +62,8 @@
#endif /* _MSC_VER */
/// Define symbolic names for the ORB collocation strategies.
-class TAO_Collocation_Strategies
+namespace TAO_Collocation_Strategies
{
-public:
enum {
/// i.e no collocation.
CS_REMOTE_STRATEGY,
@@ -82,525 +80,30 @@ public:
/// strategies.
CS_LAST
};
-};
-
-// Forward declarations of some data types are needed.
-
-class CORBA_Any;
-class CORBA_Any_var;
-class CORBA_Any_out;
-typedef class CORBA_Any *CORBA_Any_ptr;
-
-class CORBA_TypeCode;
-class CORBA_TypeCode_var;
-class CORBA_TypeCode_out;
-typedef class CORBA_TypeCode *CORBA_TypeCode_ptr;
-
-class CORBA_Exception;
-class CORBA_UserException;
-class CORBA_SystemException;
-class CORBA_UnknownUserException;
-class CORBA_ExceptionList;
-class CORBA_ExceptionList_var;
-typedef class CORBA_Exception *CORBA_Exception_ptr;
-
-// all the system exception classes, the list is used as follows:
-// - Define TAO_SYSTEM_EXCEPTION
-// - Use the list to expand that macro over all the system exceptions.
-// - Undefine TAO_SYSTEM_EXCEPTION
-#define TAO_SYSTEM_EXCEPTION_LIST \
- TAO_SYSTEM_EXCEPTION(UNKNOWN); \
- TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
- TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
- TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
- TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
- TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
- TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
- TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
- TAO_SYSTEM_EXCEPTION(INTERNAL); \
- TAO_SYSTEM_EXCEPTION(MARSHAL); \
- TAO_SYSTEM_EXCEPTION(INITIALIZE); \
- TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
- TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
- TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
- TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
- TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
- TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
- TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
- TAO_SYSTEM_EXCEPTION(TRANSIENT); \
- TAO_SYSTEM_EXCEPTION(FREE_MEM); \
- TAO_SYSTEM_EXCEPTION(INV_IDENT); \
- TAO_SYSTEM_EXCEPTION(INV_FLAG); \
- TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
- TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
- TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
- TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
- TAO_SYSTEM_EXCEPTION(INV_POLICY); \
- TAO_SYSTEM_EXCEPTION(REBIND); \
- TAO_SYSTEM_EXCEPTION(TIMEOUT); \
- TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
- TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
- TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
- TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
- TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
- TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
- TAO_SYSTEM_EXCEPTION(BAD_QOS); \
- TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
- TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
- TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED);
-
-#define TAO_SYSTEM_EXCEPTION(name) \
- class CORBA_ ## name
-TAO_SYSTEM_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-class CORBA_ConstructionPolicy;
-class CORBA_ConstructionPolicy_var;
-class CORBA_ConstructionPolicy_out;
-typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr;
-
-#endif /* ! TAO_HAS_MINIMUM_CORBA */
-
-class CORBA_Request;
-class CORBA_Request_var;
-class CORBA_Request_out;
-typedef class CORBA_Request *CORBA_Request_ptr;
-
-class CORBA_ORB_RequestSeq;
-class CORBA_ORB_RequestSeq_var;
-class CORBA_ORB_RequestSeq_out;
-
-class CORBA_NamedValue;
-class CORBA_NamedValue_var;
-class CORBA_NamedValue_out;
-typedef class CORBA_NamedValue *CORBA_NamedValue_ptr;
-
-class CORBA_NVList;
-class CORBA_NVList_var;
-class CORBA_NVList_out;
-typedef class CORBA_NVList *CORBA_NVList_ptr;
-
-class CORBA_Context;
-class CORBA_Context_var;
-class CORBA_Context_out;
-typedef class CORBA_Context *CORBA_Context_ptr;
-
-class CORBA_ContextList;
-class CORBA_ContextList_var;
-class CORBA_ContextList_out;
-typedef class CORBA_ContextList *CORBA_ContextList_ptr;
-
-class CORBA_ORB;
-class CORBA_ORB_var;
-class CORBA_ORB_out;
-typedef class CORBA_ORB *CORBA_ORB_ptr;
-
-class CORBA_Object;
-class CORBA_Object_var;
-class CORBA_Object_out;
-typedef class CORBA_Object *CORBA_Object_ptr;
-
-class CORBA_LocalObject;
-class CORBA_LocalObject_var;
-class CORBA_LocalObject_out;
-typedef class CORBA_LocalObject *CORBA_LocalObject_ptr;
-
-class CORBA_Current;
-class CORBA_Current_var;
-class CORBA_Current_out;
-typedef class CORBA_Current *CORBA_Current_ptr;
-
-class TAO_ServerRequest;
-class CORBA_ServerRequest;
-typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr;
-
-class CORBA_Environment;
-class CORBA_Environment_var;
-class CORBA_Environment_out;
-typedef class CORBA_Environment *CORBA_Environment_ptr;
-
-// = Service Forward declaration
-struct CORBA_ServiceDetail;
-class CORBA_ServiceDetail_var;
-class CORBA_ServiceDetail_out;
-typedef CORBA_ServiceDetail * CORBA_ServiceDetail_ptr;
-
-struct CORBA_ServiceInformation;
-class CORBA_ServiceInformation_var;
-class CORBA_ServiceInformation_out;
-typedef CORBA_ServiceInformation * CORBA_ServiceInformation_ptr;
-
-class CORBA_Principal;
-class CORBA_Principal_var;
-class CORBA_Principal_out;
-typedef class CORBA_Principal *CORBA_Principal_ptr;
-
-typedef class CORBA_ImplementationDef *CORBA_ImplementationDef_ptr;
-
-class CORBA_ValueBase;
-class CORBA_ValueBase_var;
-class CORBA_ValueBase_out;
-class CORBA_ValueFactoryBase;
-class CORBA_ValueFactoryBase_var;
-typedef CORBA_ValueFactoryBase *CORBA_ValueFactory;
-typedef CORBA_ValueFactoryBase_var CORBA_ValueFactory_var;
-class CORBA_DefaultValueRefCountBase;
-
-class CORBA_AbstractBase;
-typedef CORBA_AbstractBase *CORBA_AbstractBase_ptr;
-class CORBA_AbstractBase_var;
-class CORBA_AbstractBase_out;
-
-class CORBA_String_var;
-class CORBA_String_out;
-class CORBA_WString_var;
-class CORBA_WString_out;
-
-class CORBA_ExceptionList;
-
-/**
- * @todo This should be TAO_TAO_Stub
- */
-class TAO_InputCDR;
-class TAO_OutputCDR;
-class TAO_Stub;
-
-class CORBA_ORB_ObjectIdList;
-class CORBA_ORB_ObjectIdList_var;
-class CORBA_ORB_ObjectIdList_out;
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
-
-// =================== Interface Repository =====================
-class CORBA_IRObject;
-class CORBA_IRObject_var;
-class CORBA_IRObject_out;
-typedef CORBA_IRObject *CORBA_IRObject_ptr;
-
-class CORBA_Contained;
-class CORBA_Contained_var;
-class CORBA_Contained_out;
-typedef CORBA_Contained *CORBA_Contained_ptr;
-
-class CORBA_ContainedSeq;
-class CORBA_ContainedSeq_var;
-class CORBA_ContainedSeq_out;
-
-class CORBA_Repository;
-class CORBA_Repository_var;
-class CORBA_Repository_out;
-typedef CORBA_Repository *CORBA_Repository_ptr;
-
-class CORBA_Container;
-class CORBA_Container_var;
-class CORBA_Container_out;
-typedef CORBA_Container *CORBA_Container_ptr;
-
-class CORBA_ModuleDef;
-class CORBA_ModuleDef_var;
-class CORBA_ModuleDef_out;
-typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
-
-class CORBA_ConstantDef;
-class CORBA_ConstantDef_var;
-class CORBA_ConstantDef_out;
-typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
-
-class CORBA_IDLType;
-class CORBA_IDLType_var;
-class CORBA_IDLType_out;
-typedef CORBA_IDLType *CORBA_IDLType_ptr;
-
-class CORBA_StructDef;
-class CORBA_StructDef_var;
-class CORBA_StructDef_out;
-typedef CORBA_StructDef *CORBA_StructDef_ptr;
-
-class CORBA_UnionDef;
-class CORBA_UnionDef_var;
-class CORBA_UnionDef_out;
-typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
-
-class CORBA_EnumDef;
-class CORBA_EnumDef_var;
-class CORBA_EnumDef_out;
-typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
-
-class CORBA_AliasDef;
-class CORBA_AliasDef_var;
-class CORBA_AliasDef_out;
-typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
-
-class CORBA_InterfaceDef;
-class CORBA_InterfaceDef_var;
-class CORBA_InterfaceDef_out;
-typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
-
-class CORBA_AbstractInterfaceDef;
-class CORBA_AbstractInterfaceDef_var;
-class CORBA_AbstractInterfaceDef_out;
-typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
-
-class CORBA_LocalInterfaceDef;
-class CORBA_LocalInterfaceDef_var;
-class CORBA_LocalInterfaceDef_out;
-typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
-
-class CORBA_ExceptionDef;
-class CORBA_ExceptionDef_var;
-class CORBA_ExceptionDef_out;
-typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
-
-class CORBA_NativeDef;
-class CORBA_NativeDef_var;
-class CORBA_NativeDef_out;
-typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
-
-class CORBA_InterfaceDefSeq;
-class CORBA_InterfaceDefSeq_var;
-class CORBA_InterfaceDefSeq_out;
-
-class CORBA_AbstractInterfaceDefSeq;
-class CORBA_AbstractInterfaceDefSeq_var;
-class CORBA_AbstractInterfaceDefSeq_out;
-
-class CORBA_LocalInterfaceDefSeq;
-class CORBA_LocalInterfaceDefSeq_var;
-class CORBA_LocalInterfaceDefSeq_out;
-
-class CORBA_ValueDef;
-class CORBA_ValueDef_var;
-class CORBA_ValueDef_out;
-typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
-
-class CORBA_ValueDefSeq;
-class CORBA_ValueDefSeq_var;
-class CORBA_ValueDefSeq_out;
-
-class CORBA_ValueBoxDef;
-class CORBA_ValueBoxDef_var;
-class CORBA_ValueBoxDef_out;
-typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
-
-struct CORBA_StructMember;
-class CORBA_StructMember_var;
-class CORBA_StructMember_out;
-
-class CORBA_StructMemberSeq;
-class CORBA_StructMemberSeq_var;
-class CORBA_StructMemberSeq_out;
-
-struct CORBA_Initializer;
-class CORBA_Initializer_var;
-class CORBA_Initializer_out;
-
-class CORBA_InitializerSeq;
-class CORBA_InitializerSeq_var;
-class CORBA_InitializerSeq_out;
-
-struct CORBA_UnionMember;
-class CORBA_UnionMember_var;
-class CORBA_UnionMember_out;
-
-class CORBA_UnionMemberSeq;
-class CORBA_UnionMemberSeq_var;
-class CORBA_UnionMemberSeq_out;
-
-class CORBA_EnumMemberSeq;
-class CORBA_EnumMemberSeq_var;
-class CORBA_EnumMemberSeq_out;
-
-struct CORBA_ModuleDescription;
-class CORBA_ModuleDescription_var;
-class CORBA_ModuleDescription_out;
-
-struct CORBA_ConstantDescription;
-class CORBA_ConstantDescription_var;
-class CORBA_ConstantDescription_out;
-
-class CORBA_TypedefDef;
-class CORBA_TypedefDef_var;
-class CORBA_TypedefDef_out;
-typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
-
-struct CORBA_TypeDescription;
-class CORBA_TypeDescription_var;
-class CORBA_TypeDescription_out;
-
-class CORBA_PrimitiveDef;
-class CORBA_PrimitiveDef_var;
-class CORBA_PrimitiveDef_out;
-typedef CORBA_PrimitiveDef *CORBA_PrimitiveDef_ptr;
-
-class CORBA_StringDef;
-class CORBA_StringDef_var;
-class CORBA_StringDef_out;
-typedef CORBA_StringDef *CORBA_StringDef_ptr;
-
-class CORBA_WstringDef;
-class CORBA_WstringDef_var;
-class CORBA_WstringDef_out;
-typedef CORBA_WstringDef *CORBA_WstringDef_ptr;
-
-class CORBA_FixedDef;
-class CORBA_FixedDef_var;
-class CORBA_FixedDef_out;
-typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
-
-class CORBA_SequenceDef;
-class CORBA_SequenceDef_var;
-class CORBA_SequenceDef_out;
-typedef CORBA_SequenceDef *CORBA_SequenceDef_ptr;
-
-class CORBA_ArrayDef;
-class CORBA_ArrayDef_var;
-class CORBA_ArrayDef_out;
-typedef CORBA_ArrayDef *CORBA_ArrayDef_ptr;
-
-struct CORBA_ExceptionDescription;
-class CORBA_ExceptionDescription_var;
-class CORBA_ExceptionDescription_out;
-
-class CORBA_ExceptionDefSeq;
-class CORBA_ExceptionDefSeq_var;
-class CORBA_ExceptionDefSeq_out;
-
-class CORBA_ExcDescriptionSeq;
-class CORBA_ExcDescriptionSeq_var;
-class CORBA_ExcDescriptionSeq_out;
-
-class CORBA_AttributeDef;
-class CORBA_AttributeDef_var;
-class CORBA_AttributeDef_out;
-typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
-
-struct CORBA_AttributeDescription;
-class CORBA_AttributeDescription_var;
-class CORBA_AttributeDescription_out;
-
-struct CORBA_ParameterDescription;
-class CORBA_ParameterDescription_var;
-class CORBA_ParameterDescription_out;
-
-class CORBA_ParDescriptionSeq;
-class CORBA_ParDescriptionSeq_var;
-class CORBA_ParDescriptionSeq_out;
-
-class CORBA_ContextIdSeq;
-class CORBA_ContextIdSeq_var;
-class CORBA_ContextIdSeq_out;
-
-class CORBA_OperationDef;
-class CORBA_OperationDef_var;
-class CORBA_OperationDef_out;
-typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
-
-struct CORBA_OperationDescription;
-class CORBA_OperationDescription_var;
-class CORBA_OperationDescription_out;
-
-struct CORBA_ParameterDescription;
-class CORBA_ParameterDescription_var;
-class CORBA_ParameterDescription_out;
-
-class CORBA_RepositoryIdSeq;
-class CORBA_RepositoryIdSeq_var;
-class CORBA_RepositoryIdSeq_out;
-
-class CORBA_OpDescriptionSeq;
-class CORBA_OpDescriptionSeq_var;
-class CORBA_OpDescriptionSeq_out;
-
-class CORBA_AttrDescriptionSeq;
-class CORBA_AttrDescriptionSeq_var;
-class CORBA_AttrDescriptionSeq_out;
-
-struct CORBA_InterfaceDescription;
-class CORBA_InterfaceDescription_var;
-class CORBA_InterfaceDescription_out;
-
-struct CORBA_ValueMember;
-class CORBA_ValueMember_var;
-class CORBA_ValueMember_out;
-
-class CORBA_ValueMemberSeq;
-class CORBA_ValueMemberSeq_var;
-class CORBA_ValueMemberSeq_out;
-
-class CORBA_ValueMemberDef;
-class CORBA_ValueMemberDef_var;
-class CORBA_ValueMemberDef_out;
-typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
-
-struct CORBA_ValueDescription;
-class CORBA_ValueDescription_var;
-class CORBA_ValueDescription_out;
-
-class CORBA_TypeCodeFactory;
-class CORBA_TypeCodeFactory_var;
-class CORBA_TypeCodeFactory_out;
-typedef CORBA_TypeCodeFactory *CORBA_TypeCodeFactory_ptr;
-// =================== Interface Repository =====================
-
-class CORBA_StringSeq;
-class CORBA_StringSeq_var;
-class CORBA_StringSeq_out;
-class CORBA_WStringSeq;
-class CORBA_WStringSeq_var;
-class CORBA_WStringSeq_out;
-
-class CORBA_OctetSeq;
-class CORBA_OctetSeq_var;
-class CORBA_OctetSeq_out;
-
-// enum values defined in tao/NVList.h, bitwise ORed.
-typedef u_int CORBA_Flags;
-
-typedef void (*TAO_Skeleton)(
- TAO_ServerRequest &,
- void *,
- void *
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
- , CORBA_Environment &
-#endif
- );
+}
// forward declare sequences.
-class TAO_Unbounded_String_Sequence;
-class TAO_Unbounded_WString_Sequence;
template <class T> class TAO_Unbounded_Sequence;
-template <class T,class T_var> class TAO_Unbounded_Object_Sequence;
-// Provide a simple function to access the TSS default environment.
-// We tried with CORBA_Environment::default_environment (),
-// CORBA::default_environment() and others.
-TAO_Export CORBA_Environment& TAO_default_environment (void);
-
-enum TAO_SERVANT_LOCATION
-{
- TAO_SERVANT_FOUND,
- TAO_DEFAULT_SERVANT,
- TAO_SERVANT_MANAGER,
- TAO_SERVANT_NOT_FOUND
-};
-
-TAO_NAMESPACE CORBA
+/**
+ * @class CORBA
+ *
+ * @brief Provides the CORBA namespace.
+ *
+ * Declarations of CORBA primitive types, in addition to forward
+ * declarations of other types (e.g. interfaces, etc).
+ */
+namespace CORBA
{
- // = TITLE
- // Provides the CORBA namespace.
- //
- // = DESCRIPTION
- // This class allows the use of CORBA::Foo, as well as CORBA_Foo
- // for all standard types Foo.
-
+ /**
+ * @name CORBA Primitive Types
+ *
+ * Declarations of all CORBA primitive types.
+ */
+ //@{
typedef ACE_CDR::Boolean Boolean;
typedef Boolean &Boolean_out;
- // Out type for boolean.
- // This and the other CORBA IDL types below are
- // typedef'd to the corresponding CDR types
- // already defined in ACE.
typedef ACE_CDR::Octet Octet;
typedef Octet &Octet_out;
@@ -634,155 +137,163 @@ TAO_NAMESPACE CORBA
typedef ACE_CDR::Char Char;
typedef Char &Char_out;
- // CORBA::TypeCode typedefs.
- typedef CORBA_TypeCode TypeCode;
- typedef CORBA_TypeCode *TypeCode_ptr;
- typedef CORBA_TypeCode_var TypeCode_var;
- typedef CORBA_TypeCode_out TypeCode_out;
-
- // = String memory management.
- TAO_NAMESPACE_INLINE_FUNCTION char *string_alloc (ULong len);
- TAO_NAMESPACE_STORAGE_CLASS char *string_dup (const char *);
- TAO_NAMESPACE_INLINE_FUNCTION void string_free (char *);
-
- typedef CORBA_String_var String_var;
- typedef CORBA_String_out String_out;
-
- // WChar was standarized in CORBA 2.2, but is still a bit unstable.
-
typedef ACE_CDR::WChar WChar;
typedef WChar &WChar_out;
+ //@}
- // = String memory management routines.
- TAO_NAMESPACE_INLINE_FUNCTION WChar* wstring_alloc (ULong len);
- TAO_NAMESPACE_STORAGE_CLASS WChar* wstring_dup (const WChar *const);
- TAO_NAMESPACE_INLINE_FUNCTION void wstring_free (WChar *const);
+ // enum values defined in tao/NVList.h, bitwise ORed.
+ typedef ULong Flags;
- typedef CORBA_WString_var WString_var;
- typedef CORBA_WString_out WString_out;
+ // CORBA::TypeCode typedefs.
+ class TypeCode;
+ typedef TypeCode * TypeCode_ptr;
+ class TypeCode_var;
+ class TypeCode_out;
- /// String sequence typedefs
- typedef CORBA_StringSeq StringSeq;
- typedef CORBA_StringSeq_var StringSeq_var;
- typedef CORBA_StringSeq_out StringSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_StringSeq;
+ /**
+ * @name CORBA String Memory Management
+ *
+ * CORBA string memory management functions.
+ */
+ //@{
+ TAO_NAMESPACE_INLINE_FUNCTION char * string_alloc (ULong len);
+ extern TAO_Export char * string_dup (const char *);
+ TAO_NAMESPACE_INLINE_FUNCTION void string_free (char *);
+ //@}
- typedef CORBA_WStringSeq WStringSeq;
- typedef CORBA_WStringSeq_var WStringSeq_var;
- typedef CORBA_WStringSeq_out WStringSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_WStringSeq;
+ class String_var;
+ class String_out;
- /// Octet sequence typedef
- typedef CORBA_OctetSeq OctetSeq;
- typedef CORBA_OctetSeq_var OctetSeq_var;
- typedef CORBA_OctetSeq_out OctetSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_OctetSeq;
+ /**
+ * @name CORBA Wide String Memory Management
+ *
+ * CORBA wide string memory management functions.
+ */
+ //@{
+ TAO_NAMESPACE_INLINE_FUNCTION WChar * wstring_alloc (ULong len);
+ extern TAO_Export WChar * wstring_dup (const WChar * const);
+ TAO_NAMESPACE_INLINE_FUNCTION void wstring_free (WChar * const);
+ //@}
+
+ class WString_var;
+ class WString_out;
+
+ class StringSeq;
+ class StringSeq_var;
+ class StringSeq_out;
+ extern TAO_Export TypeCode_ptr _tc_StringSeq;
+
+ class WStringSeq;
+ class WStringSeq_var;
+ class WStringSeq_out;
+ extern TAO_Export TypeCode_ptr _tc_WStringSeq;
+
+ class OctetSeq;
+ class OctetSeq_var;
+ class OctetSeq_out;
+ extern TAO_Export TypeCode_ptr _tc_OctetSeq;
// typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
// typedef TAO_Unbounded_Sequence<Octet> OctetSeq_var;
// typedef TAO_Unbounded_Sequence<Octet> OctetSeq_out;
- // = various CORBA defined classes.
- typedef CORBA_Any Any;
- typedef CORBA_Any_var Any_var;
- typedef CORBA_Any_out Any_out;
- typedef Any *Any_ptr;
-
- typedef CORBA_Environment Environment;
- typedef CORBA_Environment_var Environment_var;
- typedef CORBA_Environment_out Environment_out;
- typedef Environment *Environment_ptr;
-
- typedef CORBA_Exception Exception;
- typedef CORBA_SystemException SystemException;
- typedef CORBA_UserException UserException;
-
- typedef CORBA_Request Request;
- typedef Request *Request_ptr;
- typedef CORBA_Request_var Request_var;
- typedef CORBA_Request_out Request_out;
-
- typedef CORBA_NamedValue NamedValue;
- typedef NamedValue *NamedValue_ptr;
- typedef CORBA_NamedValue_var NamedValue_var;
- typedef CORBA_NamedValue_out NamedValue_out;
-
- typedef CORBA_NVList NVList;
- typedef NVList *NVList_ptr;
- typedef CORBA_NVList_var NVList_var;
- typedef CORBA_NVList_out NVList_out;
-
- typedef CORBA_Context Context;
- typedef CORBA_Context *Context_ptr;
- typedef CORBA_Context_var Context_var;
- typedef CORBA_Context_out Context_out;
-
- typedef CORBA_ContextList ContextList;
- typedef CORBA_ContextList *ContextList_ptr;
- typedef CORBA_ContextList_var ContextList_var;
- typedef CORBA_ContextList_out ContextList_out;
-
- typedef CORBA_Object Object;
- typedef CORBA_Object *Object_ptr;
- typedef CORBA_Object_var Object_var;
- typedef CORBA_Object_out Object_out;
-
- typedef CORBA_LocalObject LocalObject;
- typedef CORBA_LocalObject *LocalObject_ptr;
- typedef CORBA_LocalObject_var LocalObject_var;
- typedef CORBA_LocalObject_out LocalObject_out;
-
- typedef CORBA_Principal Principal;
- typedef CORBA_Principal *Principal_ptr;
- typedef CORBA_Principal_var Principal_var;
- typedef CORBA_Principal_out Principal_out;
-
- typedef CORBA_ORB ORB;
- typedef CORBA_ORB *ORB_ptr;
- typedef CORBA_ORB_var ORB_var;
- typedef CORBA_ORB_out ORB_out;
-
- typedef CORBA_ServerRequest ServerRequest;
+ class Any;
+ class Any_var;
+ class Any_out;
+ typedef Any * Any_ptr;
+
+ class Environment;
+ class Environment_var;
+ class Environment_out;
+ typedef Environment * Environment_ptr;
+
+ class Exception;
+ typedef Exception * Exception_ptr;
+ class SystemException;
+ class UserException;
+
+ class Request;
+ typedef Request * Request_ptr;
+ class Request_var;
+ class Request_out;
+
+ class NamedValue;
+ typedef NamedValue * NamedValue_ptr;
+ class NamedValue_var;
+ class NamedValue_out;
+
+ class NVList;
+ typedef NVList * NVList_ptr;
+ class NVList_var;
+ class NVList_out;
+
+ class Context;
+ typedef Context * Context_ptr;
+ class Context_var;
+ class Context_out;
+
+ class ContextList;
+ typedef ContextList *ContextList_ptr;
+ class ContextList_var;
+ class ContextList_out;
+
+ class Object;
+ typedef Object *Object_ptr;
+ class Object_var;
+ class Object_out;
+
+ class LocalObject;
+ typedef LocalObject *LocalObject_ptr;
+ class LocalObject_var;
+ class LocalObject_out;
+
+ class Principal;
+ typedef Principal *Principal_ptr;
+ class Principal_var;
+ class Principal_out;
+
+ class ORB;
+ typedef ORB *ORB_ptr;
+ class ORB_var;
+ class ORB_out;
+
+ class ServerRequest;
typedef ServerRequest *ServerRequest_ptr;
- typedef CORBA_ExceptionList ExceptionList;
- typedef CORBA_ExceptionList_var ExceptionList_var;
- typedef CORBA_ExceptionList *ExceptionList_ptr;
-
- typedef CORBA_ImplementationDef *ImplementationDef_ptr;
-
- typedef CORBA_Current Current;
- typedef CORBA_Current *Current_ptr;
- typedef CORBA_Current_var Current_var;
- typedef CORBA_Current_out Current_out;
-
- typedef CORBA_TypeCodeFactory TypeCodeFactory;
- typedef CORBA_TypeCodeFactory *TypeCodeFactory_ptr;
- typedef CORBA_TypeCodeFactory_out TypeCodeFactory_out;
- typedef CORBA_TypeCodeFactory_var TypeCodeFactory_var;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeCodeFactory;
-
- typedef CORBA_ValueBase ValueBase;
- typedef CORBA_ValueBase *ValueBase_ptr;
- typedef CORBA_ValueBase_var ValueBase_var;
- typedef CORBA_ValueBase_out ValueBase_out;
- typedef CORBA_ValueFactoryBase ValueFactoryBase;
- typedef CORBA_ValueFactoryBase *ValueFactory;
- // as CORBA 2.3a C++ map. 20.17.10 says
- typedef CORBA_ValueFactoryBase *ValueFactory;
- typedef CORBA_ValueFactory_var ValueFactory_var;
- // own invention, more readable
- typedef CORBA_DefaultValueRefCountBase DefaultValueRefCountBase;
+ class ExceptionList;
+ class ExceptionList_var;
+ typedef ExceptionList *ExceptionList_ptr;
+
+ class ImplementationDef;
+ typedef ImplementationDef *ImplementationDef_ptr;
+
+ class Current;
+ typedef Current *Current_ptr;
+ class Current_var;
+ class Current_out;
+
+ class TypeCodeFactory;
+ typedef TypeCodeFactory *TypeCodeFactory_ptr;
+ class TypeCodeFactory_out;
+ class TypeCodeFactory_var;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_TypeCodeFactory;
+
+ class ValueBase;
+ typedef ValueBase *ValueBase_ptr;
+ class ValueBase_var;
+ class ValueBase_out;
+ class ValueFactoryBase;
+ class ValueFactoryBase_var;
+ typedef ValueFactoryBase *ValueFactory;
+ typedef ValueFactoryBase_var ValueFactory_var;
+ class DefaultValueRefCountBase;
TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *);
TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *);
- typedef CORBA_AbstractBase AbstractBase;
- typedef CORBA_AbstractBase *AbstractBase_ptr;
- typedef CORBA_AbstractBase_var AbstractBase_var;
- typedef CORBA_AbstractBase_out AbstractBase_out;
-
- // enum values defined in nvlist.hh, bitwise ORed.
- typedef u_int Flags;
+ class AbstractBase;
+ typedef AbstractBase * AbstractBase_ptr;
+ class AbstractBase_var;
+ class AbstractBase_out;
enum CompletionStatus
{
@@ -802,41 +313,94 @@ TAO_NAMESPACE CORBA
SYSTEM_EXCEPTION
};
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_exception_type;
+ extern TAO_Export TypeCode_ptr _tc_exception_type;
- // all the system exception classes
-#define TAO_SYSTEM_EXCEPTION(name) \
- typedef CORBA_ ## name name
- TAO_SYSTEM_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
- typedef CORBA_UnknownUserException UnknownUserException;
+ /**
+ * @name CORBA System Exceptions
+ *
+ * Forward Declarations of all CORBA System Exceptions.
+ */
+ //@{
+ class UNKNOWN;
+ class BAD_PARAM;
+ class NO_MEMORY;
+ class IMP_LIMIT;
+ class COMM_FAILURE;
+ class INV_OBJREF;
+ class OBJECT_NOT_EXIST;
+ class NO_PERMISSION;
+ class INTERNAL;
+ class MARSHAL;
+ class INITIALIZE;
+ class NO_IMPLEMENT;
+ class BAD_TYPECODE;
+ class BAD_OPERATION;
+ class NO_RESOURCES;
+ class NO_RESPONSE;
+ class PERSIST_STORE;
+ class BAD_INV_ORDER;
+ class TRANSIENT;
+ class FREE_MEM;
+ class INV_IDENT;
+ class INV_FLAG;
+ class INTF_REPOS;
+ class BAD_CONTEXT;
+ class OBJ_ADAPTER;
+ class DATA_CONVERSION;
+ class INV_POLICY;
+ class REBIND;
+ class TIMEOUT;
+ class TRANSACTION_UNAVAILABLE;
+ class TRANSACTION_MODE;
+ class TRANSACTION_REQUIRED;
+ class TRANSACTION_ROLLEDBACK;
+ class INVALID_TRANSACTION;
+ class CODESET_INCOMPATIBLE;
+ class BAD_QOS;
+ class INVALID_ACTIVITY;
+ class ACTIVITY_COMPLETED;
+ class ACTIVITY_REQUIRED;
+ //@}
+
+ class UnknownUserException;
- // = all the CORBA::is_nil methods.
+ /**
+ * @name CORBA::is_nil Methods
+ *
+ * Overloaded CORBA::is_nil() methods.
+ */
+ //@{
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Object_ptr);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (AbstractBase_ptr);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
- TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Request_ptr);
- TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (ServerRequest_ptr req);
+ extern TAO_Export Boolean is_nil (Request_ptr);
+ extern TAO_Export Boolean is_nil (ServerRequest_ptr req);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
- TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Context_ptr);
+ extern TAO_Export Boolean is_nil (Context_ptr);
+ //@}
- // = all the CORBA release methods.
+ /**
+ * @name CORBA::release Methods
+ *
+ * Overloaded CORBA::release() methods.
+ */
+ //@{
TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr);
TAO_NAMESPACE_INLINE_FUNCTION void release (AbstractBase_ptr);
TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
- TAO_NAMESPACE_STORAGE_CLASS void release (Request_ptr);
- TAO_NAMESPACE_STORAGE_CLASS void release (ServerRequest_ptr req);
+ extern TAO_Export void release (Request_ptr);
+ extern TAO_Export void release (ServerRequest_ptr req);
TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
- TAO_NAMESPACE_STORAGE_CLASS void release (Context_ptr);
+ extern TAO_Export void release (Context_ptr);
+ //@}
enum TCKind
{
@@ -888,7 +452,7 @@ TAO_NAMESPACE CORBA
tk_home = 35,
tk_event = 36,
- // This symbol is not defined by CORBA 2.0. It's used to speed up
+ // This symbol is not defined by CORBA 3.0. It's used to speed up
// dispatch based on TCKind values, and lets many important ones
// just be table lookups. It must always be the last enum value!!
@@ -896,40 +460,87 @@ TAO_NAMESPACE CORBA
};
typedef TCKind &TCKind_out;
- // All the typecode constants
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_null;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_void;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_short;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_long;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ushort;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ulong;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_float;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_double;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_boolean;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_char;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_octet;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_any;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_TypeCode;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Principal;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Object;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_string;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_longlong;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ulonglong;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_longdouble;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_wchar;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_wstring;
+ /**
+ * @name TypeCode Constants
+ *
+ * All the TypeCode constants
+ */
+ //@{
+ extern TAO_Export TypeCode_ptr _tc_null;
+ extern TAO_Export TypeCode_ptr _tc_void;
+ extern TAO_Export TypeCode_ptr _tc_short;
+ extern TAO_Export TypeCode_ptr _tc_long;
+ extern TAO_Export TypeCode_ptr _tc_ushort;
+ extern TAO_Export TypeCode_ptr _tc_ulong;
+ extern TAO_Export TypeCode_ptr _tc_float;
+ extern TAO_Export TypeCode_ptr _tc_double;
+ extern TAO_Export TypeCode_ptr _tc_boolean;
+ extern TAO_Export TypeCode_ptr _tc_char;
+ extern TAO_Export TypeCode_ptr _tc_octet;
+ extern TAO_Export TypeCode_ptr _tc_any;
+ extern TAO_Export TypeCode_ptr _tc_TypeCode;
+ extern TAO_Export TypeCode_ptr _tc_Principal;
+ extern TAO_Export TypeCode_ptr _tc_Object;
+ extern TAO_Export TypeCode_ptr _tc_string;
+ extern TAO_Export TypeCode_ptr _tc_longlong;
+ extern TAO_Export TypeCode_ptr _tc_ulonglong;
+ extern TAO_Export TypeCode_ptr _tc_longdouble;
+ extern TAO_Export TypeCode_ptr _tc_wchar;
+ extern TAO_Export TypeCode_ptr _tc_wstring;
+
+#define TAO_SYSTEM_EXCEPTION_LIST \
+ TAO_SYSTEM_EXCEPTION(UNKNOWN); \
+ TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
+ TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
+ TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
+ TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
+ TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
+ TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
+ TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
+ TAO_SYSTEM_EXCEPTION(INTERNAL); \
+ TAO_SYSTEM_EXCEPTION(MARSHAL); \
+ TAO_SYSTEM_EXCEPTION(INITIALIZE); \
+ TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
+ TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
+ TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
+ TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
+ TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
+ TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
+ TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
+ TAO_SYSTEM_EXCEPTION(TRANSIENT); \
+ TAO_SYSTEM_EXCEPTION(FREE_MEM); \
+ TAO_SYSTEM_EXCEPTION(INV_IDENT); \
+ TAO_SYSTEM_EXCEPTION(INV_FLAG); \
+ TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
+ TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
+ TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
+ TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
+ TAO_SYSTEM_EXCEPTION(INV_POLICY); \
+ TAO_SYSTEM_EXCEPTION(REBIND); \
+ TAO_SYSTEM_EXCEPTION(TIMEOUT); \
+ TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
+ TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
+ TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
+ TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
+ TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
+ TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
+ TAO_SYSTEM_EXCEPTION(BAD_QOS); \
+ TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
+ TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
+ TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED);
// = Typecode constants for system exceptions.
#define TAO_SYSTEM_EXCEPTION(name) \
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_ ## name
+ extern TAO_Export TypeCode_ptr _tc_ ## name
TAO_SYSTEM_EXCEPTION_LIST
#undef TAO_SYSTEM_EXCEPTION
+ //@}
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_UnknownUserException;
+ extern TAO_Export TypeCode_ptr _tc_UnknownUserException;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_Current;
+ extern TAO_Export TypeCode_ptr _tc_Current;
- TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_NamedValue;
+ extern TAO_Export TypeCode_ptr _tc_NamedValue;
enum
{
@@ -951,92 +562,86 @@ TAO_NAMESPACE CORBA
RESP_NO_WAIT = 0x400
};
- typedef char *ORBid;
+ typedef char * ORBid;
typedef CORBA::String_var ORBid_var;
typedef CORBA::String_out ORBid_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ORBid;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ORBid;
// = Service definitions
typedef CORBA::UShort ServiceType;
- typedef ServiceType CORBA_ServiceType;
typedef CORBA::UShort_out ServiceType_out;
- typedef ServiceType_out CORBA_ServiceType_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceType;
- TAO_NAMESPACE_STORAGE_CLASS const ServiceType Security;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceType;
+ extern TAO_Export const ServiceType Security;
typedef CORBA::ULong ServiceOption;
- typedef ServiceOption CORBA_ServiceOption;
typedef CORBA::ULong_out ServiceOption_out;
- typedef ServiceOption_out CORBA_ServiceOption_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceOption;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceOption;
typedef CORBA::ULong ServiceDetailType;
- typedef ServiceDetailType CORBA_ServiceDetailType;
typedef CORBA::ULong_out ServiceDetailType_out;
- typedef ServiceDetailType_out CORBA_ServiceDetailType_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceDetailType;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceDetailType;
- typedef CORBA_ServiceDetail ServiceDetail;
- typedef CORBA_ServiceDetail_var ServiceDetail_var;
- typedef CORBA_ServiceDetail_out ServiceDetail_out;
- typedef CORBA_ServiceDetail *ServiceDetail_ptr;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceDetail;
+ struct ServiceDetail;
+ class ServiceDetail_var;
+ class ServiceDetail_out;
+ typedef ServiceDetail * ServiceDetail_ptr;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceDetail;
- typedef CORBA_ServiceInformation ServiceInformation;
- typedef CORBA_ServiceInformation_var ServiceInformation_var;
- typedef CORBA_ServiceInformation_out ServiceInformation_out;
- typedef CORBA_ServiceInformation *ServiceInformation_ptr;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceInformation;
+ struct ServiceInformation;
+ class ServiceInformation_var;
+ class ServiceInformation_out;
+ typedef ServiceInformation * ServiceInformation_ptr;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ServiceInformation;
// ****************************************************************
// =================== Interface Repository =====================
- typedef char *RepositoryId;
+ typedef char * RepositoryId;
typedef CORBA::String_var RepositoryId_var;
typedef CORBA::String_out RepositoryId_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_RepositoryId;
- typedef char *Identifier;
+ typedef char * Identifier;
typedef CORBA::String_var Identifier_var;
typedef CORBA::String_out Identifier_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_Identifier;
- typedef char *ScopedName;
- typedef CORBA_String_var ScopedName_var;
- typedef CORBA_String_out ScopedName_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
+ typedef char * ScopedName;
+ typedef String_var ScopedName_var;
+ typedef String_out ScopedName_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ScopedName;
- typedef char *VersionSpec;
- typedef CORBA_String_var VersionSpec_var;
- typedef CORBA_String_out VersionSpec_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
+ typedef char * VersionSpec;
+ typedef String_var VersionSpec_var;
+ typedef String_out VersionSpec_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_VersionSpec;
typedef CORBA::Short Visibility;
typedef CORBA::Short_out Visibility_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Visibility;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_Visibility;
- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PRIVATE_MEMBER;
- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PUBLIC_MEMBER;
+ extern TAO_Export const CORBA::Short PRIVATE_MEMBER;
+ extern TAO_Export const CORBA::Short PUBLIC_MEMBER;
typedef CORBA::Short ValueModifier;
typedef CORBA::Short_out ValueModifier_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueModifier;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueModifier;
- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_NONE;
- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_CUSTOM;
- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_ABSTRACT;
- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_TRUNCATABLE;
+ extern TAO_Export const CORBA::Short VM_NONE;
+ extern TAO_Export const CORBA::Short VM_CUSTOM;
+ extern TAO_Export const CORBA::Short VM_ABSTRACT;
+ extern TAO_Export const CORBA::Short VM_TRUNCATABLE;
typedef char * ContextIdentifier;
typedef CORBA::String_var ContextIdentifier_var;
typedef CORBA::String_out ContextIdentifier_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdentifier;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ContextIdentifier;
- typedef CORBA_IRObject IRObject;
- typedef CORBA_IRObject *IRObject_ptr;
- typedef CORBA_IRObject_var IRObject_var;
- typedef CORBA_IRObject_out IRObject_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IRObject;
+ class IRObject;
+ typedef IRObject * IRObject_ptr;
+ class IRObject_var;
+ class IRObject_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_IRObject;
enum DefinitionKind
{
@@ -1079,242 +684,242 @@ TAO_NAMESPACE CORBA
dk_Event
};
- typedef DefinitionKind &DefinitionKind_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
-
- typedef CORBA_Contained Contained;
- typedef CORBA_Contained *Contained_ptr;
- typedef CORBA_Contained_var Contained_var;
- typedef CORBA_Contained_out Contained_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Contained;
-
- typedef CORBA_ContainedSeq ContainedSeq;
- typedef CORBA_ContainedSeq_var ContainedSeq_var;
- typedef CORBA_ContainedSeq_out ContainedSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContainedSeq;
-
- typedef CORBA_Repository Repository;
- typedef CORBA_Repository *Repository_ptr;
- typedef CORBA_Repository_var Repository_var;
- typedef CORBA_Repository_out Repository_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Repository;
-
- typedef CORBA_Container Container;
- typedef CORBA_Container *Container_ptr;
- typedef CORBA_Container_var Container_var;
- typedef CORBA_Container_out Container_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Container;
-
- typedef CORBA_ModuleDef ModuleDef;
- typedef CORBA_ModuleDef *ModuleDef_ptr;
- typedef CORBA_ModuleDef_var ModuleDef_var;
- typedef CORBA_ModuleDef_out ModuleDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDef;
-
- typedef CORBA_ConstantDef ConstantDef;
- typedef CORBA_ConstantDef *ConstantDef_ptr;
- typedef CORBA_ConstantDef_var ConstantDef_var;
- typedef CORBA_ConstantDef_out ConstantDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDef;
-
- typedef CORBA_IDLType IDLType;
- typedef CORBA_IDLType *IDLType_ptr;
- typedef CORBA_IDLType_var IDLType_var;
- typedef CORBA_IDLType_out IDLType_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IDLType;
-
- typedef CORBA_StructDef StructDef;
- typedef CORBA_StructDef *StructDef_ptr;
- typedef CORBA_StructDef_var StructDef_var;
- typedef CORBA_StructDef_out StructDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructDef;
-
- typedef CORBA_UnionDef UnionDef;
- typedef CORBA_UnionDef *UnionDef_ptr;
- typedef CORBA_UnionDef_var UnionDef_var;
- typedef CORBA_UnionDef_out UnionDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionDef;
-
- typedef CORBA_EnumDef EnumDef;
- typedef CORBA_EnumDef *EnumDef_ptr;
- typedef CORBA_EnumDef_var EnumDef_var;
- typedef CORBA_EnumDef_out EnumDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumDef;
-
- typedef CORBA_AliasDef AliasDef;
- typedef CORBA_AliasDef *AliasDef_ptr;
- typedef CORBA_AliasDef_var AliasDef_var;
- typedef CORBA_AliasDef_out AliasDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AliasDef;
-
- typedef CORBA_InterfaceDef InterfaceDef;
- typedef CORBA_InterfaceDef *InterfaceDef_ptr;
- typedef CORBA_InterfaceDef_var InterfaceDef_var;
- typedef CORBA_InterfaceDef_out InterfaceDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDef;
-
- typedef CORBA_AbstractInterfaceDef AbstractInterfaceDef;
- typedef CORBA_AbstractInterfaceDef *AbstractInterfaceDef_ptr;
- typedef CORBA_AbstractInterfaceDef_var AbstractInterfaceDef_var;
- typedef CORBA_AbstractInterfaceDef_out AbstractInterfaceDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AbstractInterfaceDef;
-
- typedef CORBA_LocalInterfaceDef LocalInterfaceDef;
- typedef CORBA_LocalInterfaceDef *LocalInterfaceDef_ptr;
- typedef CORBA_LocalInterfaceDef_var LocalInterfaceDef_var;
- typedef CORBA_LocalInterfaceDef_out LocalInterfaceDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LocalInterfaceDef;
-
- typedef CORBA_ExceptionDef ExceptionDef;
- typedef CORBA_ExceptionDef *ExceptionDef_ptr;
- typedef CORBA_ExceptionDef_var ExceptionDef_var;
- typedef CORBA_ExceptionDef_out ExceptionDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDef;
-
- typedef CORBA_NativeDef NativeDef;
- typedef CORBA_NativeDef *NativeDef_ptr;
- typedef CORBA_NativeDef_var NativeDef_var;
- typedef CORBA_NativeDef_out NativeDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativeDef;
-
- typedef CORBA_InterfaceDefSeq InterfaceDefSeq;
- typedef CORBA_InterfaceDefSeq_var InterfaceDefSeq_var;
- typedef CORBA_InterfaceDefSeq_out InterfaceDefSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-
- typedef CORBA_AbstractInterfaceDefSeq AbstractInterfaceDefSeq;
- typedef CORBA_AbstractInterfaceDefSeq_var AbstractInterfaceDefSeq_var;
- typedef CORBA_AbstractInterfaceDefSeq_out AbstractInterfaceDefSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
-
- typedef CORBA_LocalInterfaceDefSeq LocalInterfaceDefSeq;
- typedef CORBA_LocalInterfaceDefSeq_var LocalInterfaceDefSeq_var;
- typedef CORBA_LocalInterfaceDefSeq_out LocalInterfaceDefSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
-
- typedef CORBA_ValueDef ValueDef;
- typedef CORBA_ValueDef *ValueDef_ptr;
- typedef CORBA_ValueDef_var ValueDef_var;
- typedef CORBA_ValueDef_out ValueDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDef;
-
- typedef CORBA_ValueDefSeq ValueDefSeq;
- typedef CORBA_ValueDefSeq_var ValueDefSeq_var;
- typedef CORBA_ValueDefSeq_out ValueDefSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDefSeq;
-
- typedef CORBA_ValueBoxDef ValueBoxDef;
- typedef CORBA_ValueBoxDef *ValueBoxDef_ptr;
- typedef CORBA_ValueBoxDef_var ValueBoxDef_var;
- typedef CORBA_ValueBoxDef_out ValueBoxDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueBoxDef;
-
- typedef CORBA_StructMember StructMember;
- typedef CORBA_StructMember_var StructMember_var;
- typedef CORBA_StructMember_out StructMember_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMember;
-
- typedef CORBA_StructMemberSeq StructMemberSeq;
- typedef CORBA_StructMemberSeq_var StructMemberSeq_var;
- typedef CORBA_StructMemberSeq_out StructMemberSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMemberSeq;
-
- typedef CORBA_Initializer Initializer;
- typedef CORBA_Initializer_var Initializer_var;
- typedef CORBA_Initializer_out Initializer_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Initializer;
-
- typedef CORBA_InitializerSeq InitializerSeq;
- typedef CORBA_InitializerSeq_var InitializerSeq_var;
- typedef CORBA_InitializerSeq_out InitializerSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InitializerSeq;
-
- typedef CORBA_UnionMember UnionMember;
- typedef CORBA_UnionMember_var UnionMember_var;
- typedef CORBA_UnionMember_out UnionMember_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMember;
-
- typedef CORBA_UnionMemberSeq UnionMemberSeq;
- typedef CORBA_UnionMemberSeq_var UnionMemberSeq_var;
- typedef CORBA_UnionMemberSeq_out UnionMemberSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMemberSeq;
-
- typedef CORBA_EnumMemberSeq EnumMemberSeq;
- typedef CORBA_EnumMemberSeq_var EnumMemberSeq_var;
- typedef CORBA_EnumMemberSeq_out EnumMemberSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-
- typedef CORBA_ModuleDescription ModuleDescription;
- typedef CORBA_ModuleDescription_var ModuleDescription_var;
- typedef CORBA_ModuleDescription_out ModuleDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDescription;
-
- typedef CORBA_ConstantDescription ConstantDescription;
- typedef CORBA_ConstantDescription_var ConstantDescription_var;
- typedef CORBA_ConstantDescription_out ConstantDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDescription;
-
- typedef CORBA_TypedefDef TypedefDef;
- typedef CORBA_TypedefDef *TypedefDef_ptr;
- typedef CORBA_TypedefDef_var TypedefDef_var;
- typedef CORBA_TypedefDef_out TypedefDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypedefDef;
-
- typedef CORBA_TypeDescription TypeDescription;
- typedef CORBA_TypeDescription_var TypeDescription_var;
- typedef CORBA_TypeDescription_out TypeDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeDescription;
-
- typedef CORBA_PrimitiveDef PrimitiveDef;
- typedef CORBA_PrimitiveDef *PrimitiveDef_ptr;
- typedef CORBA_PrimitiveDef_var PrimitiveDef_var;
- typedef CORBA_PrimitiveDef_out PrimitiveDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveDef;
-
- typedef CORBA_StringDef StringDef;
- typedef CORBA_StringDef *StringDef_ptr;
- typedef CORBA_StringDef_var StringDef_var;
- typedef CORBA_StringDef_out StringDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringDef;
-
- typedef CORBA_WstringDef WstringDef;
- typedef CORBA_WstringDef *WstringDef_ptr;
- typedef CORBA_WstringDef_var WstringDef_var;
- typedef CORBA_WstringDef_out WstringDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WstringDef;
-
- typedef CORBA_FixedDef FixedDef;
- typedef CORBA_FixedDef *FixedDef_ptr;
- typedef CORBA_FixedDef_var FixedDef_var;
- typedef CORBA_FixedDef_out FixedDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FixedDef;
-
- typedef CORBA_SequenceDef SequenceDef;
- typedef CORBA_SequenceDef *SequenceDef_ptr;
- typedef CORBA_SequenceDef_var SequenceDef_var;
- typedef CORBA_SequenceDef_out SequenceDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SequenceDef;
-
- typedef CORBA_ArrayDef ArrayDef;
- typedef CORBA_ArrayDef *ArrayDef_ptr;
- typedef CORBA_ArrayDef_var ArrayDef_var;
- typedef CORBA_ArrayDef_out ArrayDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ArrayDef;
-
- typedef CORBA_ExceptionDescription ExceptionDescription;
- typedef CORBA_ExceptionDescription_var ExceptionDescription_var;
- typedef CORBA_ExceptionDescription_out ExceptionDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDescription;
-
- typedef CORBA_ExceptionDefSeq ExceptionDefSeq;
- typedef CORBA_ExceptionDefSeq_var ExceptionDefSeq_var;
- typedef CORBA_ExceptionDefSeq_out ExceptionDefSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
-
- typedef CORBA_ExcDescriptionSeq ExcDescriptionSeq;
- typedef CORBA_ExcDescriptionSeq_var ExcDescriptionSeq_var;
- typedef CORBA_ExcDescriptionSeq_out ExcDescriptionSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
+ typedef DefinitionKind & DefinitionKind_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_DefinitionKind;
+
+ class Contained;
+ typedef Contained * Contained_ptr;
+ class Contained_var;
+ class Contained_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_Contained;
+
+ class ContainedSeq;
+ class ContainedSeq_var;
+ class ContainedSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ContainedSeq;
+
+ class Repository;
+ typedef Repository * Repository_ptr;
+ class Repository_var;
+ class Repository_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_Repository;
+
+ class Container;
+ typedef Container * Container_ptr;
+ class Container_var;
+ class Container_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_Container;
+
+ class ModuleDef;
+ typedef ModuleDef * ModuleDef_ptr;
+ class ModuleDef_var;
+ class ModuleDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ModuleDef;
+
+ class ConstantDef;
+ typedef ConstantDef * ConstantDef_ptr;
+ class ConstantDef_var;
+ class ConstantDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ConstantDef;
+
+ class IDLType;
+ typedef IDLType * IDLType_ptr;
+ class IDLType_var;
+ class IDLType_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_IDLType;
+
+ class StructDef;
+ typedef StructDef * StructDef_ptr;
+ class StructDef_var;
+ class StructDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_StructDef;
+
+ class UnionDef;
+ typedef UnionDef * UnionDef_ptr;
+ class UnionDef_var;
+ class UnionDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_UnionDef;
+
+ class EnumDef;
+ typedef EnumDef * EnumDef_ptr;
+ class EnumDef_var;
+ class EnumDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_EnumDef;
+
+ class AliasDef;
+ typedef AliasDef * AliasDef_ptr;
+ class AliasDef_var;
+ class AliasDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AliasDef;
+
+ class InterfaceDef;
+ typedef InterfaceDef * InterfaceDef_ptr;
+ class InterfaceDef_var;
+ class InterfaceDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_InterfaceDef;
+
+ class AbstractInterfaceDef;
+ typedef AbstractInterfaceDef * AbstractInterfaceDef_ptr;
+ class AbstractInterfaceDef_var;
+ class AbstractInterfaceDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AbstractInterfaceDef;
+
+ class LocalInterfaceDef;
+ typedef LocalInterfaceDef * LocalInterfaceDef_ptr;
+ class LocalInterfaceDef_var;
+ class LocalInterfaceDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_LocalInterfaceDef;
+
+ class ExceptionDef;
+ typedef ExceptionDef * ExceptionDef_ptr;
+ class ExceptionDef_var;
+ class ExceptionDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ExceptionDef;
+
+ class NativeDef;
+ typedef NativeDef * NativeDef_ptr;
+ class NativeDef_var;
+ class NativeDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_NativeDef;
+
+ class InterfaceDefSeq;
+ class InterfaceDefSeq_var;
+ class InterfaceDefSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
+
+ class AbstractInterfaceDefSeq;
+ class AbstractInterfaceDefSeq_var;
+ class AbstractInterfaceDefSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AbstractInterfaceDefSeq;
+
+ class LocalInterfaceDefSeq;
+ class LocalInterfaceDefSeq_var;
+ class LocalInterfaceDefSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_LocalInterfaceDefSeq;
+
+ class ValueDef;
+ typedef ValueDef * ValueDef_ptr;
+ class ValueDef_var;
+ class ValueDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueDef;
+
+ class ValueDefSeq;
+ class ValueDefSeq_var;
+ class ValueDefSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueDefSeq;
+
+ class ValueBoxDef;
+ typedef ValueBoxDef * ValueBoxDef_ptr;
+ class ValueBoxDef_var;
+ class ValueBoxDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueBoxDef;
+
+ struct StructMember;
+ class StructMember_var;
+ class StructMember_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_StructMember;
+
+ class StructMemberSeq;
+ class StructMemberSeq_var;
+ class StructMemberSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_StructMemberSeq;
+
+ struct Initializer;
+ class Initializer_var;
+ class Initializer_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_Initializer;
+
+ class InitializerSeq;
+ class InitializerSeq_var;
+ class InitializerSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_InitializerSeq;
+
+ struct UnionMember;
+ class UnionMember_var;
+ class UnionMember_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_UnionMember;
+
+ class UnionMemberSeq;
+ class UnionMemberSeq_var;
+ class UnionMemberSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_UnionMemberSeq;
+
+ class EnumMemberSeq;
+ class EnumMemberSeq_var;
+ class EnumMemberSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_EnumMemberSeq;
+
+ struct ModuleDescription;
+ class ModuleDescription_var;
+ class ModuleDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ModuleDescription;
+
+ struct ConstantDescription;
+ class ConstantDescription_var;
+ class ConstantDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ConstantDescription;
+
+ class TypedefDef;
+ typedef TypedefDef * TypedefDef_ptr;
+ class TypedefDef_var;
+ class TypedefDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_TypedefDef;
+
+ struct TypeDescription;
+ class TypeDescription_var;
+ class TypeDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_TypeDescription;
+
+ class PrimitiveDef;
+ typedef PrimitiveDef * PrimitiveDef_ptr;
+ class PrimitiveDef_var;
+ class PrimitiveDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_PrimitiveDef;
+
+ class StringDef;
+ typedef StringDef * StringDef_ptr;
+ class StringDef_var;
+ class StringDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_StringDef;
+
+ class WstringDef;
+ typedef WstringDef * WstringDef_ptr;
+ class WstringDef_var;
+ class WstringDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_WstringDef;
+
+ class FixedDef;
+ typedef FixedDef * FixedDef_ptr;
+ class FixedDef_var;
+ class FixedDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_FixedDef;
+
+ class SequenceDef;
+ typedef SequenceDef * SequenceDef_ptr;
+ class SequenceDef_var;
+ class SequenceDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_SequenceDef;
+
+ class ArrayDef;
+ typedef ArrayDef * ArrayDef_ptr;
+ class ArrayDef_var;
+ class ArrayDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ArrayDef;
+
+ struct ExceptionDescription;
+ class ExceptionDescription_var;
+ class ExceptionDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ExceptionDescription;
+
+ class ExceptionDefSeq;
+ class ExceptionDefSeq_var;
+ class ExceptionDefSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
+
+ class ExcDescriptionSeq;
+ class ExcDescriptionSeq_var;
+ class ExcDescriptionSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
enum AttributeMode
{
@@ -1322,19 +927,19 @@ TAO_NAMESPACE CORBA
ATTR_READONLY
};
- typedef AttributeMode &AttributeMode_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
+ typedef AttributeMode & AttributeMode_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AttributeMode;
- typedef CORBA_AttributeDef AttributeDef;
- typedef CORBA_AttributeDef *AttributeDef_ptr;
- typedef CORBA_AttributeDef_var AttributeDef_var;
- typedef CORBA_AttributeDef_out AttributeDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDef;
+ class AttributeDef;
+ typedef AttributeDef * AttributeDef_ptr;
+ class AttributeDef_var;
+ class AttributeDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AttributeDef;
- typedef CORBA_AttributeDescription AttributeDescription;
- typedef CORBA_AttributeDescription_var AttributeDescription_var;
- typedef CORBA_AttributeDescription_out AttributeDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
+ struct AttributeDescription;
+ class AttributeDescription_var;
+ class AttributeDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AttributeDescription;
enum PrimitiveKind
{
@@ -1362,8 +967,8 @@ TAO_NAMESPACE CORBA
pk_value_base
};
- typedef PrimitiveKind &PrimitiveKind_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
+ typedef PrimitiveKind & PrimitiveKind_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_PrimitiveKind;
enum ParameterMode
{
@@ -1372,29 +977,29 @@ TAO_NAMESPACE CORBA
PARAM_INOUT
};
- typedef ParameterMode &ParameterMode_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
+ typedef ParameterMode & ParameterMode_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ParameterMode;
- typedef CORBA_ParameterDescription ParameterDescription;
- typedef CORBA_ParameterDescription_var ParameterDescription_var;
- typedef CORBA_ParameterDescription_out ParameterDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterDescription;
+ struct ParameterDescription;
+ class ParameterDescription_var;
+ class ParameterDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ParameterDescription;
- typedef CORBA_ParDescriptionSeq ParDescriptionSeq;
- typedef CORBA_ParDescriptionSeq_var ParDescriptionSeq_var;
- typedef CORBA_ParDescriptionSeq_out ParDescriptionSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
+ class ParDescriptionSeq;
+ class ParDescriptionSeq_var;
+ class ParDescriptionSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
- typedef CORBA_ContextIdSeq ContextIdSeq;
- typedef CORBA_ContextIdSeq_var ContextIdSeq_var;
- typedef CORBA_ContextIdSeq_out ContextIdSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdSeq;
+ class ContextIdSeq;
+ class ContextIdSeq_var;
+ class ContextIdSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ContextIdSeq;
- typedef CORBA_OperationDef OperationDef;
- typedef CORBA_OperationDef *OperationDef_ptr;
- typedef CORBA_OperationDef_var OperationDef_var;
- typedef CORBA_OperationDef_out OperationDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDef;
+ class OperationDef;
+ typedef OperationDef * OperationDef_ptr;
+ class OperationDef_var;
+ class OperationDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_OperationDef;
enum OperationMode
{
@@ -1402,77 +1007,94 @@ TAO_NAMESPACE CORBA
OP_ONEWAY
};
- typedef OperationMode &OperationMode_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
-
- typedef CORBA_OperationDescription OperationDescription;
- typedef CORBA_OperationDescription_var OperationDescription_var;
- typedef CORBA_OperationDescription_out OperationDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDescription;
-
- typedef CORBA_RepositoryIdSeq RepositoryIdSeq;
- typedef CORBA_RepositoryIdSeq_var RepositoryIdSeq_var;
- typedef CORBA_RepositoryIdSeq_out RepositoryIdSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-
- typedef CORBA_OpDescriptionSeq OpDescriptionSeq;
- typedef CORBA_OpDescriptionSeq_var OpDescriptionSeq_var;
- typedef CORBA_OpDescriptionSeq_out OpDescriptionSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
-
- typedef CORBA_AttrDescriptionSeq AttrDescriptionSeq;
- typedef CORBA_AttrDescriptionSeq_var AttrDescriptionSeq_var;
- typedef CORBA_AttrDescriptionSeq_out AttrDescriptionSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
-
- typedef CORBA_InterfaceDescription InterfaceDescription;
- typedef CORBA_InterfaceDescription_var InterfaceDescription_var;
- typedef CORBA_InterfaceDescription_out InterfaceDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDescription;
-
- typedef CORBA_ValueMember ValueMember;
- typedef CORBA_ValueMember_var ValueMember_var;
- typedef CORBA_ValueMember_out ValueMember_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMember;
-
- typedef CORBA_ValueMemberSeq ValueMemberSeq;
- typedef CORBA_ValueMemberSeq_var ValueMemberSeq_var;
- typedef CORBA_ValueMemberSeq_out ValueMemberSeq_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberSeq;
-
- typedef CORBA_ValueMemberDef ValueMemberDef;
- typedef CORBA_ValueMemberDef *ValueMemberDef_ptr;
- typedef CORBA_ValueMemberDef_var ValueMemberDef_var;
- typedef CORBA_ValueMemberDef_out ValueMemberDef_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberDef;
-
- typedef CORBA_ValueDescription ValueDescription;
- typedef CORBA_ValueDescription_var ValueDescription_var;
- typedef CORBA_ValueDescription_out ValueDescription_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDescription;
+ typedef OperationMode & OperationMode_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_OperationMode;
+
+ struct OperationDescription;
+ class OperationDescription_var;
+ class OperationDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_OperationDescription;
+
+ class RepositoryIdSeq;
+ class RepositoryIdSeq_var;
+ class RepositoryIdSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
+
+ class OpDescriptionSeq;
+ class OpDescriptionSeq_var;
+ class OpDescriptionSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
+
+ class AttrDescriptionSeq;
+ class AttrDescriptionSeq_var;
+ class AttrDescriptionSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
+
+ struct InterfaceDescription;
+ class InterfaceDescription_var;
+ class InterfaceDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_InterfaceDescription;
+
+ struct ValueMember;
+ class ValueMember_var;
+ class ValueMember_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueMember;
+
+ class ValueMemberSeq;
+ class ValueMemberSeq_var;
+ class ValueMemberSeq_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueMemberSeq;
+
+ class ValueMemberDef;
+ typedef ValueMemberDef * ValueMemberDef_ptr;
+ class ValueMemberDef_var;
+ class ValueMemberDef_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueMemberDef;
+
+ struct ValueDescription;
+ class ValueDescription_var;
+ class ValueDescription_out;
+ extern TAO_Export CORBA::TypeCode_ptr _tc_ValueDescription;
// ================== Interface Repository =====================
- // There could be a single version of these methods, but g++ 2.7.2
- // gets horribly confused if we used CORBA::default_environment() at
- // this point.
- TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
- char *argv[],
- const char *orb_name = 0);
- TAO_NAMESPACE_STORAGE_CLASS ORB_ptr ORB_init (int &argc,
- char *argv[],
- const char *orb_name,
- CORBA_Environment &ACE_TRY_ENV);
- // ORB initialisation
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+ class ConstructionPolicy;
+ typedef ConstructionPolicy * ConstructionPolicy_ptr;
+#endif /* ! TAO_HAS_MINIMUM_CORBA */
+
+ /**
+ * @name ORB Initialization
+ *
+ * There could be a single version of these methods, but g++ 2.7.2
+ * gets horribly confused if we used CORBA::default_environment() at
+ * this point.
+ */
+ //@{
+ extern TAO_Export ORB_ptr ORB_init (int & argc,
+ char * argv[],
+ const char * orb_name = 0);
+ extern TAO_Export ORB_ptr ORB_init (int & argc,
+ char * argv[],
+ const char * orb_name,
+ CORBA::Environment &ACE_TRY_ENV);
+ //@}
// = TAO extensions...
- TAO_NAMESPACE_INLINE_FUNCTION CORBA_Environment& default_environment (void);
-
- // Obtain the thread-specific default environment.
- // This is obsolete and only left here for backwards compatibility.
+ /// Obtain the thread-specific default environment. This is
+ /// obsolete and only left here for backwards compatibility.
+ TAO_NAMESPACE_INLINE_FUNCTION CORBA::Environment& default_environment (void);
}
-TAO_NAMESPACE_CLOSE // end of class (namespace) CORBA
+// end of namespace CORBA
+
+// ****************************************************************
+
+/// Provide a simple function to access the TSS default environment.
+/**
+ * @note We tried with CORBA::default_environment() and others.
+ */
+TAO_Export CORBA::Environment& TAO_default_environment (void);
// ****************************************************************
@@ -1540,14 +1162,6 @@ const CORBA::ULong TAO_TAG_UIPMC_PROFILE = 0x54414f0CU;
const CORBA::ULong TAO_TAG_BIOP_PROFILE = 0x54414f0FU;
//@}
-/**
- * @name TAO-Specific Profile Tagged Component IDs
- *
- * The TAO @c IOP::TaggedComponent range 0x54414f00 - 0x54414f0f has
- * been reserved with the OMG.
- */
-//@{
-
/// The TAO-specific OMG assigned value for the TAG_ORB_TYPE tagged
/// component.
/**
@@ -1557,12 +1171,17 @@ const CORBA::ULong TAO_TAG_BIOP_PROFILE = 0x54414f0FU;
*/
const CORBA::ULong TAO_ORB_TYPE = 0x54414f00U;
+/**
+ * @name TAO-Specific Profile Tagged Component IDs
+ *
+ * The TAO @c IOP::TaggedComponent range 0x54414f00 - 0x54414f0f has
+ * been reserved with the OMG.
+ */
+//@{
+
// This tag is no longer used in TAO. It will not be reused for a
// period of time to preserve backward compatibility with servers
// running older versions of TAO.
-// ********* CHANGE THE VALUE!!!! IT IS THE SAME AS THE TAO_ORB_TYPE
-// VALUE. THE ORB TYPE IS A TAGGED COMPONENT TOO SO TAO_TAG_PRIORITY
-// SHOULD HAVE A DIFFERENT VALUE.
// #define TAO_TAG_PRIORITY 0x54414f00U
// Tag 0x54414f01U is defined/used by SSLIOP.
@@ -1708,6 +1327,9 @@ const CORBA::ULong TAO_ENOTSUP_MINOR_CODE = 0x14U;
#define TAO_TWOWAY_RESPONSE_FLAG 255
// ****************************************************************
+class TAO_InputCDR;
+class TAO_OutputCDR;
+
// A helper class to handle the various kinds of octet sequences used
// inside the ORB.
@@ -1726,9 +1348,6 @@ operator<< (TAO_OutputCDR &, const CORBA::TCKind &);
TAO_Export CORBA::Boolean
operator>> (TAO_InputCDR &, CORBA::TCKind &);
-class TAO_ObjectKey;
-class TAO_ObjectKey_var;
-class TAO_ObjectKey_out;
#if defined (__ACE_INLINE__)
# include "tao/corbafwd.i"
@@ -1739,4 +1358,5 @@ class TAO_ObjectKey_out;
#endif /* _MSC_VER */
#include "ace/post.h"
+
#endif /* TAO_CORBAFWD_H */
diff --git a/TAO/tao/objectid.h b/TAO/tao/objectid.h
index 546d3ee3853..66bda28c597 100644
--- a/TAO/tao/objectid.h
+++ b/TAO/tao/objectid.h
@@ -8,7 +8,6 @@
*
* ObjectIds redefined for TAO and recognized by CORBA
*
- * @author Copyright 1995 by Sun Microsystems, Inc.
* @author Chris Cleeland
* @author Douglas C. Schmidt
*/
@@ -36,7 +35,7 @@
* configuration.
*/
-// ObjectIds recognized by CORBA_ORB::resolve_initial_references ()...
+// ObjectIds recognized by CORBA::ORB::resolve_initial_references()...
// of course, no guarantees are made that the call will return
// something useful.
#define TAO_OBJID_NAMESERVICE "NameService"
@@ -67,7 +66,7 @@
// Comma separated list of the above ObjectIDs.
// DO NOT include unimplemented services!
-// The CORBA_ORB::list_initial_services () method iterates through
+// The CORBA::ORB::list_initial_services () method iterates through
// this list to determine which initial services are available.
#define TAO_LIST_OF_INITIAL_SERVICES \
TAO_OBJID_NAMESERVICE, \
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index bee83d4fb04..368550d4313 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -66,7 +66,7 @@ ORT_test_IORInterceptor::components_established (
ACE_NEW_THROW_EX (tmp,
ObjectReferenceFactory (old_orf.in ()),
CORBA::NO_MEMORY (
- CORBA_SystemException::_tao_minor_code (
+ CORBA::SystemException::_tao_minor_code (
TAO_DEFAULT_MINOR_CODE,
ENOMEM),
CORBA::COMPLETED_NO));