diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-11 01:29:39 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-11 01:29:39 +0000 |
commit | 9f096aa68b0e470e16b67ac0a82e3a93d1d2443f (patch) | |
tree | 0f9435b8dd4fd246d95e2ae454f5afacbe22e739 /TAO/orbsvcs/IFR_Service | |
parent | 415b6d27f09681067a0643ea87b4ebbb619aa156 (diff) | |
download | ATCD-9f096aa68b0e470e16b67ac0a82e3a93d1d2443f.tar.gz |
ChangeLogTag: Thu May 10 20:17:48 2001 Jeff Parsons <parsons@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs/IFR_Service')
-rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp | 116 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp | 482 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp | 16 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp | 132 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/Servant_Factory.cpp | 66 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff | 479 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff | 1480 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff | 54 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff | 469 |
9 files changed, 2809 insertions, 485 deletions
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp index 1f7724de564..04fed0ddd80 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp @@ -529,7 +529,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind ( return ACE_reinterpret_cast ( POA_CORBA_IRObject_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_IRObject:1.0" + "IDL:omg.org/CORBA/IRObject:1.0" ) )->def_kind ( ACE_TRY_ENV @@ -558,7 +558,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy ( ACE_reinterpret_cast ( POA_CORBA_IRObject_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_IRObject:1.0" + "IDL:omg.org/CORBA/IRObject:1.0" ) )->destroy ( ACE_TRY_ENV @@ -832,7 +832,7 @@ CORBA::Boolean POA_CORBA_IRObject::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -843,7 +843,7 @@ void* POA_CORBA_IRObject::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -857,7 +857,7 @@ void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA const char* POA_CORBA_IRObject::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_IRObject:1.0"; + return "IDL:omg.org/CORBA/IRObject:1.0"; } CORBA_IRObject* @@ -2527,7 +2527,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->id ( ACE_TRY_ENV @@ -2557,7 +2557,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id ( ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->id ( id, @@ -2590,7 +2590,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->name ( ACE_TRY_ENV @@ -2620,7 +2620,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name ( ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->name ( name, @@ -2653,7 +2653,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->version ( ACE_TRY_ENV @@ -2683,7 +2683,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version ( ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->version ( version, @@ -2716,7 +2716,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in ( return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->defined_in ( ACE_TRY_ENV @@ -2747,7 +2747,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name ( return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->absolute_name ( ACE_TRY_ENV @@ -2778,7 +2778,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->containing_repository ( ACE_TRY_ENV @@ -2809,7 +2809,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe return ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->describe ( ACE_TRY_ENV @@ -2841,7 +2841,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move ( ACE_reinterpret_cast ( POA_CORBA_Contained_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Contained:1.0" + "IDL:omg.org/CORBA/Contained:1.0" ) )->move ( new_container, @@ -3854,8 +3854,8 @@ CORBA::Boolean POA_CORBA_Contained::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -3866,9 +3866,9 @@ void* POA_CORBA_Contained::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -3882,7 +3882,7 @@ void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *context, CORB const char* POA_CORBA_Contained::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_Contained:1.0"; + return "IDL:omg.org/CORBA/Contained:1.0"; } CORBA_Contained* @@ -6946,7 +6946,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->lookup ( search_name, @@ -6980,7 +6980,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->contents ( limit_type, @@ -7017,7 +7017,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->lookup_name ( search_name, @@ -7055,7 +7055,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->describe_contents ( limit_type, @@ -7092,7 +7092,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_module ( id, @@ -7131,7 +7131,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_constant ( id, @@ -7171,7 +7171,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_struct ( id, @@ -7211,7 +7211,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_union ( id, @@ -7251,7 +7251,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_enum ( id, @@ -7290,7 +7290,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_alias ( id, @@ -7329,7 +7329,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_interface ( id, @@ -7374,7 +7374,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_value ( id, @@ -7419,7 +7419,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_value_box ( id, @@ -7458,7 +7458,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_exception ( id, @@ -7496,7 +7496,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native ( return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_native ( id, @@ -7534,7 +7534,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_abstract_interface ( id, @@ -7573,7 +7573,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca return ACE_reinterpret_cast ( POA_CORBA_Container_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Container:1.0" + "IDL:omg.org/CORBA/Container:1.0" ) )->create_local_interface ( id, @@ -9419,8 +9419,8 @@ CORBA::Boolean POA_CORBA_Container::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -9431,9 +9431,9 @@ void* POA_CORBA_Container::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -9447,7 +9447,7 @@ void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *context, CORB const char* POA_CORBA_Container::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_Container:1.0"; + return "IDL:omg.org/CORBA/Container:1.0"; } CORBA_Container* @@ -9842,7 +9842,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type ( return ACE_reinterpret_cast ( POA_CORBA_IDLType_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_IDLType:1.0" + "IDL:omg.org/CORBA/IDLType:1.0" ) )->type ( ACE_TRY_ENV @@ -10047,8 +10047,8 @@ CORBA::Boolean POA_CORBA_IDLType::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -10059,9 +10059,9 @@ void* POA_CORBA_IDLType::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -10075,7 +10075,7 @@ void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *context, CORBA: const char* POA_CORBA_IDLType::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_IDLType:1.0"; + return "IDL:omg.org/CORBA/IDLType:1.0"; } CORBA_IDLType* @@ -10474,10 +10474,10 @@ CORBA::Boolean POA_CORBA_TypedefDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -10488,13 +10488,13 @@ void* POA_CORBA_TypedefDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -10508,7 +10508,7 @@ void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *context, COR const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_TypedefDef:1.0"; + return "IDL:omg.org/CORBA/TypedefDef:1.0"; } CORBA_TypedefDef* diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp index 632826babd0..54bad62bc41 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp @@ -1444,7 +1444,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id ( return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->lookup_id ( search_id, @@ -1477,7 +1477,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->get_canonical_typecode ( tc, @@ -1510,7 +1510,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive ( return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->get_primitive ( kind, @@ -1543,7 +1543,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string ( return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->create_string ( bound, @@ -1576,7 +1576,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring ( return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->create_wstring ( bound, @@ -1610,7 +1610,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->create_sequence ( bound, @@ -1645,7 +1645,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array ( return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->create_array ( length, @@ -1680,7 +1680,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed ( return ACE_reinterpret_cast ( POA_CORBA_Repository_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_Repository:1.0" + "IDL:omg.org/CORBA/Repository:1.0" ) )->create_fixed ( digits, @@ -2532,9 +2532,9 @@ CORBA::Boolean POA_CORBA_Repository::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -2545,11 +2545,11 @@ void* POA_CORBA_Repository::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0) return ACE_static_cast (POA_CORBA_Repository_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -2563,7 +2563,7 @@ void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *context, COR const char* POA_CORBA_Repository::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_Repository:1.0"; + return "IDL:omg.org/CORBA/Repository:1.0"; } CORBA_Repository* @@ -2980,10 +2980,10 @@ CORBA::Boolean POA_CORBA_ModuleDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -2994,13 +2994,13 @@ void* POA_CORBA_ModuleDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -3014,7 +3014,7 @@ void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *context, CORB const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ModuleDef:1.0"; + return "IDL:omg.org/CORBA/ModuleDef:1.0"; } CORBA_ModuleDef* @@ -3935,7 +3935,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type ( return ACE_reinterpret_cast ( POA_CORBA_ConstantDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ConstantDef:1.0" + "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type ( ACE_TRY_ENV @@ -3966,7 +3966,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( return ACE_reinterpret_cast ( POA_CORBA_ConstantDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ConstantDef:1.0" + "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type_def ( ACE_TRY_ENV @@ -3996,7 +3996,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def ( ACE_reinterpret_cast ( POA_CORBA_ConstantDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ConstantDef:1.0" + "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->type_def ( type_def, @@ -4029,7 +4029,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( return ACE_reinterpret_cast ( POA_CORBA_ConstantDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ConstantDef:1.0" + "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->value ( ACE_TRY_ENV @@ -4059,7 +4059,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value ( ACE_reinterpret_cast ( POA_CORBA_ConstantDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ConstantDef:1.0" + "IDL:omg.org/CORBA/ConstantDef:1.0" ) )->value ( value, @@ -4585,9 +4585,9 @@ CORBA::Boolean POA_CORBA_ConstantDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -4598,11 +4598,11 @@ void* POA_CORBA_ConstantDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ConstantDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -4616,7 +4616,7 @@ void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *context, CO const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ConstantDef:1.0"; + return "IDL:omg.org/CORBA/ConstantDef:1.0"; } CORBA_ConstantDef* @@ -5186,7 +5186,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( return ACE_reinterpret_cast ( POA_CORBA_StructDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_StructDef:1.0" + "IDL:omg.org/CORBA/StructDef:1.0" ) )->members ( ACE_TRY_ENV @@ -5216,7 +5216,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members ( ACE_reinterpret_cast ( POA_CORBA_StructDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_StructDef:1.0" + "IDL:omg.org/CORBA/StructDef:1.0" ) )->members ( members, @@ -5506,12 +5506,12 @@ CORBA::Boolean POA_CORBA_StructDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -5522,17 +5522,17 @@ void* POA_CORBA_StructDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0) return ACE_static_cast (POA_CORBA_StructDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -5546,7 +5546,7 @@ void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *context, CORB const char* POA_CORBA_StructDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_StructDef:1.0"; + return "IDL:omg.org/CORBA/StructDef:1.0"; } CORBA_StructDef* @@ -6488,7 +6488,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type ( return ACE_reinterpret_cast ( POA_CORBA_UnionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_UnionDef:1.0" + "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type ( ACE_TRY_ENV @@ -6519,7 +6519,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def return ACE_reinterpret_cast ( POA_CORBA_UnionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_UnionDef:1.0" + "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type_def ( ACE_TRY_ENV @@ -6549,7 +6549,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def ( ACE_reinterpret_cast ( POA_CORBA_UnionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_UnionDef:1.0" + "IDL:omg.org/CORBA/UnionDef:1.0" ) )->discriminator_type_def ( discriminator_type_def, @@ -6582,7 +6582,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( return ACE_reinterpret_cast ( POA_CORBA_UnionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_UnionDef:1.0" + "IDL:omg.org/CORBA/UnionDef:1.0" ) )->members ( ACE_TRY_ENV @@ -6612,7 +6612,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members ( ACE_reinterpret_cast ( POA_CORBA_UnionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_UnionDef:1.0" + "IDL:omg.org/CORBA/UnionDef:1.0" ) )->members ( members, @@ -7141,12 +7141,12 @@ CORBA::Boolean POA_CORBA_UnionDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -7157,17 +7157,17 @@ void* POA_CORBA_UnionDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0) return ACE_static_cast (POA_CORBA_UnionDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -7181,7 +7181,7 @@ void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA const char* POA_CORBA_UnionDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_UnionDef:1.0"; + return "IDL:omg.org/CORBA/UnionDef:1.0"; } CORBA_UnionDef* @@ -7732,7 +7732,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( return ACE_reinterpret_cast ( POA_CORBA_EnumDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_EnumDef:1.0" + "IDL:omg.org/CORBA/EnumDef:1.0" ) )->members ( ACE_TRY_ENV @@ -7762,7 +7762,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members ( ACE_reinterpret_cast ( POA_CORBA_EnumDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_EnumDef:1.0" + "IDL:omg.org/CORBA/EnumDef:1.0" ) )->members ( members, @@ -8051,11 +8051,11 @@ CORBA::Boolean POA_CORBA_EnumDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -8066,15 +8066,15 @@ void* POA_CORBA_EnumDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0) return ACE_static_cast (POA_CORBA_EnumDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -8088,7 +8088,7 @@ void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA: const char* POA_CORBA_EnumDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_EnumDef:1.0"; + return "IDL:omg.org/CORBA/EnumDef:1.0"; } CORBA_EnumDef* @@ -8639,7 +8639,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( return ACE_reinterpret_cast ( POA_CORBA_AliasDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AliasDef:1.0" + "IDL:omg.org/CORBA/AliasDef:1.0" ) )->original_type_def ( ACE_TRY_ENV @@ -8669,7 +8669,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def ( ACE_reinterpret_cast ( POA_CORBA_AliasDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AliasDef:1.0" + "IDL:omg.org/CORBA/AliasDef:1.0" ) )->original_type_def ( original_type_def, @@ -8958,11 +8958,11 @@ CORBA::Boolean POA_CORBA_AliasDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -8973,15 +8973,15 @@ void* POA_CORBA_AliasDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0) return ACE_static_cast (POA_CORBA_AliasDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -8995,7 +8995,7 @@ void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA const char* POA_CORBA_AliasDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_AliasDef:1.0"; + return "IDL:omg.org/CORBA/AliasDef:1.0"; } CORBA_AliasDef* @@ -9395,11 +9395,11 @@ CORBA::Boolean POA_CORBA_NativeDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -9410,15 +9410,15 @@ void* POA_CORBA_NativeDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0) return ACE_static_cast (POA_CORBA_NativeDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -9432,7 +9432,7 @@ void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *context, CORB const char* POA_CORBA_NativeDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_NativeDef:1.0"; + return "IDL:omg.org/CORBA/NativeDef:1.0"; } CORBA_NativeDef* @@ -9828,7 +9828,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind ( return ACE_reinterpret_cast ( POA_CORBA_PrimitiveDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_PrimitiveDef:1.0" + "IDL:omg.org/CORBA/PrimitiveDef:1.0" ) )->kind ( ACE_TRY_ENV @@ -10033,9 +10033,9 @@ CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -10046,11 +10046,11 @@ void* POA_CORBA_PrimitiveDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0) return ACE_static_cast (POA_CORBA_PrimitiveDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -10064,7 +10064,7 @@ void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *context, C const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_PrimitiveDef:1.0"; + return "IDL:omg.org/CORBA/PrimitiveDef:1.0"; } CORBA_PrimitiveDef* @@ -10602,7 +10602,7 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( return ACE_reinterpret_cast ( POA_CORBA_StringDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_StringDef:1.0" + "IDL:omg.org/CORBA/StringDef:1.0" ) )->bound ( ACE_TRY_ENV @@ -10632,7 +10632,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound ( ACE_reinterpret_cast ( POA_CORBA_StringDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_StringDef:1.0" + "IDL:omg.org/CORBA/StringDef:1.0" ) )->bound ( bound, @@ -10918,9 +10918,9 @@ CORBA::Boolean POA_CORBA_StringDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -10931,11 +10931,11 @@ void* POA_CORBA_StringDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0) return ACE_static_cast (POA_CORBA_StringDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -10949,7 +10949,7 @@ void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *context, CORB const char* POA_CORBA_StringDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_StringDef:1.0"; + return "IDL:omg.org/CORBA/StringDef:1.0"; } CORBA_StringDef* @@ -11487,7 +11487,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( return ACE_reinterpret_cast ( POA_CORBA_WstringDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_WstringDef:1.0" + "IDL:omg.org/CORBA/WstringDef:1.0" ) )->bound ( ACE_TRY_ENV @@ -11517,7 +11517,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound ( ACE_reinterpret_cast ( POA_CORBA_WstringDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_WstringDef:1.0" + "IDL:omg.org/CORBA/WstringDef:1.0" ) )->bound ( bound, @@ -11803,9 +11803,9 @@ CORBA::Boolean POA_CORBA_WstringDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -11816,11 +11816,11 @@ void* POA_CORBA_WstringDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0) return ACE_static_cast (POA_CORBA_WstringDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -11834,7 +11834,7 @@ void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *context, COR const char* POA_CORBA_WstringDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_WstringDef:1.0"; + return "IDL:omg.org/CORBA/WstringDef:1.0"; } CORBA_WstringDef* @@ -12741,7 +12741,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( return ACE_reinterpret_cast ( POA_CORBA_SequenceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_SequenceDef:1.0" + "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->bound ( ACE_TRY_ENV @@ -12771,7 +12771,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound ( ACE_reinterpret_cast ( POA_CORBA_SequenceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_SequenceDef:1.0" + "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->bound ( bound, @@ -12804,7 +12804,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type ( return ACE_reinterpret_cast ( POA_CORBA_SequenceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_SequenceDef:1.0" + "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type ( ACE_TRY_ENV @@ -12835,7 +12835,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( return ACE_reinterpret_cast ( POA_CORBA_SequenceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_SequenceDef:1.0" + "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type_def ( ACE_TRY_ENV @@ -12865,7 +12865,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def ( ACE_reinterpret_cast ( POA_CORBA_SequenceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_SequenceDef:1.0" + "IDL:omg.org/CORBA/SequenceDef:1.0" ) )->element_type_def ( element_type_def, @@ -13390,9 +13390,9 @@ CORBA::Boolean POA_CORBA_SequenceDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -13403,11 +13403,11 @@ void* POA_CORBA_SequenceDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_SequenceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -13421,7 +13421,7 @@ void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *context, CO const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_SequenceDef:1.0"; + return "IDL:omg.org/CORBA/SequenceDef:1.0"; } CORBA_SequenceDef* @@ -14331,7 +14331,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( return ACE_reinterpret_cast ( POA_CORBA_ArrayDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ArrayDef:1.0" + "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->length ( ACE_TRY_ENV @@ -14361,7 +14361,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length ( ACE_reinterpret_cast ( POA_CORBA_ArrayDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ArrayDef:1.0" + "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->length ( length, @@ -14394,7 +14394,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type ( return ACE_reinterpret_cast ( POA_CORBA_ArrayDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ArrayDef:1.0" + "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type ( ACE_TRY_ENV @@ -14425,7 +14425,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( return ACE_reinterpret_cast ( POA_CORBA_ArrayDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ArrayDef:1.0" + "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type_def ( ACE_TRY_ENV @@ -14455,7 +14455,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def ( ACE_reinterpret_cast ( POA_CORBA_ArrayDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ArrayDef:1.0" + "IDL:omg.org/CORBA/ArrayDef:1.0" ) )->element_type_def ( element_type_def, @@ -14980,9 +14980,9 @@ CORBA::Boolean POA_CORBA_ArrayDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -14993,11 +14993,11 @@ void* POA_CORBA_ArrayDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ArrayDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -15011,7 +15011,7 @@ void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ArrayDef:1.0"; + return "IDL:omg.org/CORBA/ArrayDef:1.0"; } CORBA_ArrayDef* @@ -15704,7 +15704,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type ( return ACE_reinterpret_cast ( POA_CORBA_ExceptionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ExceptionDef:1.0" + "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->type ( ACE_TRY_ENV @@ -15735,7 +15735,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( return ACE_reinterpret_cast ( POA_CORBA_ExceptionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ExceptionDef:1.0" + "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->members ( ACE_TRY_ENV @@ -15765,7 +15765,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members ( ACE_reinterpret_cast ( POA_CORBA_ExceptionDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ExceptionDef:1.0" + "IDL:omg.org/CORBA/ExceptionDef:1.0" ) )->members ( members, @@ -16133,10 +16133,10 @@ CORBA::Boolean POA_CORBA_ExceptionDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -16147,13 +16147,13 @@ void* POA_CORBA_ExceptionDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ExceptionDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -16167,7 +16167,7 @@ void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *context, C const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ExceptionDef:1.0"; + return "IDL:omg.org/CORBA/ExceptionDef:1.0"; } CORBA_ExceptionDef* @@ -17089,7 +17089,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type ( return ACE_reinterpret_cast ( POA_CORBA_AttributeDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AttributeDef:1.0" + "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type ( ACE_TRY_ENV @@ -17120,7 +17120,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( return ACE_reinterpret_cast ( POA_CORBA_AttributeDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AttributeDef:1.0" + "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type_def ( ACE_TRY_ENV @@ -17150,7 +17150,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def ( ACE_reinterpret_cast ( POA_CORBA_AttributeDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AttributeDef:1.0" + "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->type_def ( type_def, @@ -17183,7 +17183,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( return ACE_reinterpret_cast ( POA_CORBA_AttributeDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AttributeDef:1.0" + "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->mode ( ACE_TRY_ENV @@ -17213,7 +17213,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode ( ACE_reinterpret_cast ( POA_CORBA_AttributeDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_AttributeDef:1.0" + "IDL:omg.org/CORBA/AttributeDef:1.0" ) )->mode ( mode, @@ -17738,9 +17738,9 @@ CORBA::Boolean POA_CORBA_AttributeDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -17751,11 +17751,11 @@ void* POA_CORBA_AttributeDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0) return ACE_static_cast (POA_CORBA_AttributeDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -17769,7 +17769,7 @@ void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *context, C const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_AttributeDef:1.0"; + return "IDL:omg.org/CORBA/AttributeDef:1.0"; } CORBA_AttributeDef* @@ -19486,7 +19486,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result ( return ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result ( ACE_TRY_ENV @@ -19517,7 +19517,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( return ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result_def ( ACE_TRY_ENV @@ -19547,7 +19547,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def ( ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->result_def ( result_def, @@ -19580,7 +19580,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( return ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->params ( ACE_TRY_ENV @@ -19610,7 +19610,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params ( ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->params ( params, @@ -19643,7 +19643,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( return ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->mode ( ACE_TRY_ENV @@ -19673,7 +19673,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode ( ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->mode ( mode, @@ -19706,7 +19706,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( return ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->contexts ( ACE_TRY_ENV @@ -19736,7 +19736,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts ( ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->contexts ( contexts, @@ -19769,7 +19769,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( return ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->exceptions ( ACE_TRY_ENV @@ -19799,7 +19799,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions ( ACE_reinterpret_cast ( POA_CORBA_OperationDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_OperationDef:1.0" + "IDL:omg.org/CORBA/OperationDef:1.0" ) )->exceptions ( exceptions, @@ -20801,9 +20801,9 @@ CORBA::Boolean POA_CORBA_OperationDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -20814,11 +20814,11 @@ void* POA_CORBA_OperationDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0) return ACE_static_cast (POA_CORBA_OperationDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -20832,7 +20832,7 @@ void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *context, C const char* POA_CORBA_OperationDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_OperationDef:1.0"; + return "IDL:omg.org/CORBA/OperationDef:1.0"; } CORBA_OperationDef* @@ -22038,7 +22038,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa return ACE_reinterpret_cast ( POA_CORBA_InterfaceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_InterfaceDef:1.0" + "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->base_interfaces ( ACE_TRY_ENV @@ -22068,7 +22068,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces ( ACE_reinterpret_cast ( POA_CORBA_InterfaceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_InterfaceDef:1.0" + "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->base_interfaces ( base_interfaces, @@ -22102,7 +22102,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a ( return ACE_reinterpret_cast ( POA_CORBA_InterfaceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_InterfaceDef:1.0" + "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->is_a ( interface_id, @@ -22134,7 +22134,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P return ACE_reinterpret_cast ( POA_CORBA_InterfaceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_InterfaceDef:1.0" + "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->describe_interface ( ACE_TRY_ENV @@ -22170,7 +22170,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib return ACE_reinterpret_cast ( POA_CORBA_InterfaceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_InterfaceDef:1.0" + "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->create_attribute ( id, @@ -22214,7 +22214,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat return ACE_reinterpret_cast ( POA_CORBA_InterfaceDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_InterfaceDef:1.0" + "IDL:omg.org/CORBA/InterfaceDef:1.0" ) )->create_operation ( id, @@ -22899,11 +22899,11 @@ CORBA::Boolean POA_CORBA_InterfaceDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -22914,15 +22914,15 @@ void* POA_CORBA_InterfaceDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -22936,7 +22936,7 @@ void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, C const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_InterfaceDef:1.0"; + return "IDL:omg.org/CORBA/InterfaceDef:1.0"; } CORBA_InterfaceDef* @@ -23363,12 +23363,12 @@ CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -23379,17 +23379,17 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -23403,7 +23403,7 @@ void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *co const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0"; + return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"; } CORBA_AbstractInterfaceDef* @@ -23830,12 +23830,12 @@ CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -23846,17 +23846,17 @@ void* POA_CORBA_LocalInterfaceDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -23870,7 +23870,7 @@ void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *conte const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0"; + return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"; } CORBA_LocalInterfaceDef* diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp index 90cc3936416..90b37987e7b 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp @@ -8980,7 +8980,7 @@ CORBA::Boolean POA_IR::ComponentDef::_is_a ( if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -8997,7 +8997,7 @@ void* POA_IR::ComponentDef::_downcast ( { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0) return ACE_static_cast (POA_IR::ComponentDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); @@ -10399,7 +10399,7 @@ CORBA::Boolean POA_IR::FactoryDef::_is_a ( if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -10414,7 +10414,7 @@ void* POA_IR::FactoryDef::_downcast ( { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0) return ACE_static_cast (POA_IR::FactoryDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0) return ACE_static_cast (POA_CORBA_OperationDef_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); @@ -10893,7 +10893,7 @@ CORBA::Boolean POA_IR::FinderDef::_is_a ( if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) @@ -10908,7 +10908,7 @@ void* POA_IR::FinderDef::_downcast ( { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0) return ACE_static_cast (POA_IR::FinderDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0) return ACE_static_cast (POA_CORBA_OperationDef_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); @@ -13705,7 +13705,7 @@ CORBA::Boolean POA_IR::HomeDef::_is_a ( if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -13722,7 +13722,7 @@ void* POA_IR::HomeDef::_downcast ( { if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0) return ACE_static_cast (POA_IR::HomeDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp index 09e16bb5e83..9437eb22414 100644 --- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp @@ -808,7 +808,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( return ACE_reinterpret_cast ( POA_CORBA_FixedDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_FixedDef:1.0" + "IDL:omg.org/CORBA/FixedDef:1.0" ) )->digits ( ACE_TRY_ENV @@ -838,7 +838,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits ( ACE_reinterpret_cast ( POA_CORBA_FixedDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_FixedDef:1.0" + "IDL:omg.org/CORBA/FixedDef:1.0" ) )->digits ( digits, @@ -871,7 +871,7 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( return ACE_reinterpret_cast ( POA_CORBA_FixedDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_FixedDef:1.0" + "IDL:omg.org/CORBA/FixedDef:1.0" ) )->scale ( ACE_TRY_ENV @@ -901,7 +901,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale ( ACE_reinterpret_cast ( POA_CORBA_FixedDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_FixedDef:1.0" + "IDL:omg.org/CORBA/FixedDef:1.0" ) )->scale ( scale, @@ -1345,9 +1345,9 @@ CORBA::Boolean POA_CORBA_FixedDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -1358,11 +1358,11 @@ void* POA_CORBA_FixedDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0) return ACE_static_cast (POA_CORBA_FixedDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -1376,7 +1376,7 @@ void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA const char* POA_CORBA_FixedDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_FixedDef:1.0"; + return "IDL:omg.org/CORBA/FixedDef:1.0"; } CORBA_FixedDef* @@ -2297,7 +2297,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type ( return ACE_reinterpret_cast ( POA_CORBA_ValueMemberDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueMemberDef:1.0" + "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type ( ACE_TRY_ENV @@ -2328,7 +2328,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( return ACE_reinterpret_cast ( POA_CORBA_ValueMemberDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueMemberDef:1.0" + "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type_def ( ACE_TRY_ENV @@ -2358,7 +2358,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def ( ACE_reinterpret_cast ( POA_CORBA_ValueMemberDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueMemberDef:1.0" + "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->type_def ( type_def, @@ -2391,7 +2391,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( return ACE_reinterpret_cast ( POA_CORBA_ValueMemberDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueMemberDef:1.0" + "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->access ( ACE_TRY_ENV @@ -2421,7 +2421,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access ( ACE_reinterpret_cast ( POA_CORBA_ValueMemberDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueMemberDef:1.0" + "IDL:omg.org/CORBA/ValueMemberDef:1.0" ) )->access ( access, @@ -2946,9 +2946,9 @@ CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -2959,11 +2959,11 @@ void* POA_CORBA_ValueMemberDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ValueMemberDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -2977,7 +2977,7 @@ void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *context, const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ValueMemberDef:1.0"; + return "IDL:omg.org/CORBA/ValueMemberDef:1.0"; } CORBA_ValueMemberDef* @@ -5841,7 +5841,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->supported_interfaces ( ACE_TRY_ENV @@ -5871,7 +5871,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->supported_interfaces ( supported_interfaces, @@ -5904,7 +5904,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->initializers ( ACE_TRY_ENV @@ -5934,7 +5934,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->initializers ( initializers, @@ -5967,7 +5967,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->base_value ( ACE_TRY_ENV @@ -5997,7 +5997,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->base_value ( base_value, @@ -6030,7 +6030,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->abstract_base_values ( ACE_TRY_ENV @@ -6060,7 +6060,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->abstract_base_values ( abstract_base_values, @@ -6093,7 +6093,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_abstract ( ACE_TRY_ENV @@ -6123,7 +6123,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_abstract ( is_abstract, @@ -6156,7 +6156,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_custom ( ACE_TRY_ENV @@ -6186,7 +6186,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_custom ( is_custom, @@ -6219,7 +6219,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_truncatable ( ACE_TRY_ENV @@ -6249,7 +6249,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable ( ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_truncatable ( is_truncatable, @@ -6283,7 +6283,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a ( return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->is_a ( id, @@ -6315,7 +6315,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->describe_value ( ACE_TRY_ENV @@ -6351,7 +6351,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->create_value_member ( id, @@ -6392,7 +6392,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->create_attribute ( id, @@ -6436,7 +6436,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation return ACE_reinterpret_cast ( POA_CORBA_ValueDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueDef:1.0" + "IDL:omg.org/CORBA/ValueDef:1.0" ) )->create_operation ( id, @@ -8177,11 +8177,11 @@ CORBA::Boolean POA_CORBA_ValueDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -8192,15 +8192,15 @@ void* POA_CORBA_ValueDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ValueDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) return ACE_static_cast (POA_CORBA_Container_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -8214,7 +8214,7 @@ void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA const char* POA_CORBA_ValueDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ValueDef:1.0"; + return "IDL:omg.org/CORBA/ValueDef:1.0"; } CORBA_ValueDef* @@ -8765,7 +8765,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( return ACE_reinterpret_cast ( POA_CORBA_ValueBoxDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueBoxDef:1.0" + "IDL:omg.org/CORBA/ValueBoxDef:1.0" ) )->original_type_def ( ACE_TRY_ENV @@ -8795,7 +8795,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def ( ACE_reinterpret_cast ( POA_CORBA_ValueBoxDef_ptr, servant_upcall.servant ()->_downcast ( - "IDL:omg.org/CORBA_ValueBoxDef:1.0" + "IDL:omg.org/CORBA/ValueBoxDef:1.0" ) )->original_type_def ( original_type_def, @@ -9084,11 +9084,11 @@ CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a ( ACE_CHECK_RETURN (0); if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else @@ -9099,15 +9099,15 @@ void* POA_CORBA_ValueBoxDef::_downcast ( const char* logical_type_id ) { - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0) return ACE_static_cast (POA_CORBA_ValueBoxDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) return ACE_static_cast (POA_CORBA_Contained_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) return ACE_static_cast (POA_CORBA_IDLType_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) return ACE_static_cast (POA_CORBA_IRObject_ptr, this); if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) return ACE_static_cast(PortableServer::Servant, this); @@ -9121,7 +9121,7 @@ void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *context, CO const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const { - return "IDL:omg.org/CORBA_ValueBoxDef:1.0"; + return "IDL:omg.org/CORBA/ValueBoxDef:1.0"; } CORBA_ValueBoxDef* diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp index 3c3393cd0d0..6c002c7d972 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp @@ -1376,108 +1376,108 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind, PortableServer::string_to_ObjectId (obj_id); // Can plug in prefix tricks here. - ACE_TString repo_id ("IDL:omg.org/IR/"); + ACE_TString repo_id ("IDL:omg.org/"); switch (def_kind) { case CORBA::dk_Attribute: - repo_id += "AttributeDef:"; + repo_id += "CORBA/AttributeDef:"; break; case CORBA::dk_Constant: - repo_id += "ConstantDef:"; + repo_id += "CORBA/ConstantDef:"; break; case CORBA::dk_Exception: - repo_id += "ExceptionDef:"; + repo_id += "CORBA/ExceptionDef:"; break; case CORBA::dk_Interface: - repo_id += "InterfaceDef:"; + repo_id += "CORBA/InterfaceDef:"; break; case CORBA::dk_AbstractInterface: - repo_id += "AbstractInterfaceDef:"; + repo_id += "CORBA/AbstractInterfaceDef:"; break; case CORBA::dk_LocalInterface: - repo_id += "LocalInterfaceDef:"; + repo_id += "CORBA/LocalInterfaceDef:"; break; case CORBA::dk_Module: - repo_id += "ModuleDef:"; + repo_id += "CORBA/ModuleDef:"; break; case CORBA::dk_Operation: - repo_id += "OperationDef:"; + repo_id += "CORBA/OperationDef:"; break; case CORBA::dk_Typedef: - repo_id += "TypedefDef:"; + repo_id += "CORBA/TypedefDef:"; break; case CORBA::dk_Alias: - repo_id += "AliasDef:"; + repo_id += "CORBA/AliasDef:"; break; case CORBA::dk_Struct: - repo_id += "StructDef:"; + repo_id += "CORBA/StructDef:"; break; case CORBA::dk_Union: - repo_id += "UnionDef:"; + repo_id += "CORBA/UnionDef:"; break; case CORBA::dk_Enum: - repo_id += "EnumDef:"; + repo_id += "CORBA/EnumDef:"; break; case CORBA::dk_Primitive: - repo_id += "PrimitiveDef:"; + repo_id += "CORBA/PrimitiveDef:"; break; case CORBA::dk_String: - repo_id += "StringDef:"; + repo_id += "CORBA/StringDef:"; break; case CORBA::dk_Sequence: - repo_id += "SequenceDef:"; + repo_id += "CORBA/SequenceDef:"; break; case CORBA::dk_Array: - repo_id += "ArrayDef:"; + repo_id += "CORBA/ArrayDef:"; break; case CORBA::dk_Wstring: - repo_id += "WstringDef:"; + repo_id += "CORBA/WstringDef:"; break; case CORBA::dk_Fixed: - repo_id += "FixedDef:"; + repo_id += "CORBA/FixedDef:"; break; case CORBA::dk_Value: - repo_id += "ValueDef:"; + repo_id += "CORBA/ValueDef:"; break; case CORBA::dk_ValueBox: - repo_id += "ValueBoxDef:"; + repo_id += "CORBA/ValueBoxDef:"; break; case CORBA::dk_ValueMember: - repo_id += "ValueMemberDef:"; + repo_id += "CORBA/ValueMemberDef:"; break; case CORBA::dk_Native: - repo_id += "NativeDef:"; + repo_id += "CORBA/NativeDef:"; break; case CORBA::dk_Component: - repo_id += "ComponentDef:"; + repo_id += "IR/ComponentDef:"; break; case CORBA::dk_Home: repo_id += "HomeDef:"; break; case CORBA::dk_Factory: - repo_id += "FactoryDef:"; + repo_id += "IR/FactoryDef:"; break; case CORBA::dk_Finder: - repo_id += "FinderDef:"; + repo_id += "IR/FinderDef:"; break; case CORBA::dk_PrimaryKey: - repo_id += "PrimaryKeyDef:"; + repo_id += "IR/PrimaryKeyDef:"; break; case CORBA::dk_Emits: - repo_id += "EmitsDef:"; + repo_id += "IR/EmitsDef:"; break; case CORBA::dk_Publishes: - repo_id += "PublishesDef:"; + repo_id += "IR/PublishesDef:"; break; case CORBA::dk_Consumes: - repo_id += "ConsumesDef:"; + repo_id += "IR/ConsumesDef:"; break; case CORBA::dk_Provides: - repo_id += "ProvidesDef:"; + repo_id += "IR/ProvidesDef:"; break; case CORBA::dk_Uses: - repo_id += "UsesDef:"; + repo_id += "IR/UsesDef:"; break; default: ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff index e24e2b503a8..2f6b9ce3def 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff @@ -1,5 +1,5 @@ ---- orig/IFR_BaseS.cpp Mon Apr 23 20:55:58 2001 -+++ IFR_BaseS.cpp Mon Apr 23 20:21:20 2001 +--- orig/IFR_BaseS.cpp Mon Apr 30 22:22:30 2001 ++++ IFR_BaseS.cpp Fri May 11 00:03:12 2001 @@ -1,6 +1,6 @@ // -*- C++ -*- // @@ -8,6 +8,17 @@ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: +@@ -19,8 +19,8 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_IFR_BASES_CPP_ +-#define _TAO_IDL_IFR_BASES_CPP_ ++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_ ++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_ + + #include "IFR_BaseS.h" + @@ -36,6 +36,7 @@ #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -20,7 +31,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:55:58 */ +-/* starting time is 17:22:29 */ +/* starting time is 12:14:19 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup */ @@ -29,16 +40,61 @@ } return 0; } --/* ending time is 15:55:58 */ +-/* ending time is 17:22:29 */ +/* ending time is 12:14:19 */ static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -528,7 +529,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_IRObject_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_IRObject:1.0" ++ "IDL:omg.org/CORBA/IRObject:1.0" + ) + )->def_kind ( + ACE_TRY_ENV +@@ -557,7 +558,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_IRObject_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_IRObject:1.0" ++ "IDL:omg.org/CORBA/IRObject:1.0" + ) + )->destroy ( + ACE_TRY_ENV +@@ -831,7 +832,7 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -842,7 +843,7 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -856,7 +857,7 @@ + + const char* POA_CORBA_IRObject::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_IRObject:1.0"; ++ return "IDL:omg.org/CORBA/IRObject:1.0"; + } + + CORBA_IRObject* @@ -884,7 +885,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:55:58 */ +-/* starting time is 17:22:29 */ +/* starting time is 12:14:19 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup */ @@ -47,16 +103,147 @@ } return 0; } --/* ending time is 15:55:58 */ +-/* ending time is 17:22:29 */ +/* ending time is 12:14:19 */ static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -2526,7 +2527,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->id ( + ACE_TRY_ENV +@@ -2556,7 +2557,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->id ( + id, +@@ -2589,7 +2590,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->name ( + ACE_TRY_ENV +@@ -2619,7 +2620,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->name ( + name, +@@ -2652,7 +2653,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->version ( + ACE_TRY_ENV +@@ -2682,7 +2683,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->version ( + version, +@@ -2715,7 +2716,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->defined_in ( + ACE_TRY_ENV +@@ -2746,7 +2747,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->absolute_name ( + ACE_TRY_ENV +@@ -2777,7 +2778,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->containing_repository ( + ACE_TRY_ENV +@@ -2808,7 +2809,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->describe ( + ACE_TRY_ENV +@@ -2840,7 +2841,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_Contained_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Contained:1.0" ++ "IDL:omg.org/CORBA/Contained:1.0" + ) + )->move ( + new_container, +@@ -3853,8 +3854,8 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -3865,9 +3866,9 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -3881,7 +3882,7 @@ + + const char* POA_CORBA_Contained::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_Contained:1.0"; ++ return "IDL:omg.org/CORBA/Contained:1.0"; + } + + CORBA_Contained* @@ -3909,7 +3910,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:55:58 */ +-/* starting time is 17:22:29 */ +/* starting time is 12:14:19 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup */ @@ -65,16 +252,201 @@ } return 0; } --/* ending time is 15:55:58 */ +-/* ending time is 17:22:29 */ +/* ending time is 12:14:19 */ static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -6945,7 +6946,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->lookup ( + search_name, +@@ -6979,7 +6980,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->contents ( + limit_type, +@@ -7016,7 +7017,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->lookup_name ( + search_name, +@@ -7054,7 +7055,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->describe_contents ( + limit_type, +@@ -7091,7 +7092,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_module ( + id, +@@ -7130,7 +7131,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_constant ( + id, +@@ -7170,7 +7171,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_struct ( + id, +@@ -7210,7 +7211,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_union ( + id, +@@ -7250,7 +7251,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_enum ( + id, +@@ -7289,7 +7290,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_alias ( + id, +@@ -7328,7 +7329,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_interface ( + id, +@@ -7373,7 +7374,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_value ( + id, +@@ -7418,7 +7419,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_value_box ( + id, +@@ -7457,7 +7458,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_exception ( + id, +@@ -7495,7 +7496,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_native ( + id, +@@ -7533,7 +7534,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_abstract_interface ( + id, +@@ -7572,7 +7573,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Container_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Container:1.0" ++ "IDL:omg.org/CORBA/Container:1.0" + ) + )->create_local_interface ( + id, +@@ -9418,8 +9419,8 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -9430,9 +9431,9 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -9446,7 +9447,7 @@ + + const char* POA_CORBA_Container::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_Container:1.0"; ++ return "IDL:omg.org/CORBA/Container:1.0"; + } + + CORBA_Container* @@ -9474,7 +9475,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:55:58 */ +-/* starting time is 17:22:30 */ +/* starting time is 12:14:19 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup */ @@ -83,16 +455,57 @@ } return 0; } --/* ending time is 15:55:58 */ +-/* ending time is 17:22:30 */ +/* ending time is 12:14:19 */ static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -9841,7 +9842,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_IDLType_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_IDLType:1.0" ++ "IDL:omg.org/CORBA/IDLType:1.0" + ) + )->type ( + ACE_TRY_ENV +@@ -10046,8 +10047,8 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -10058,9 +10059,9 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -10074,7 +10075,7 @@ + + const char* POA_CORBA_IDLType::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_IDLType:1.0"; ++ return "IDL:omg.org/CORBA/IDLType:1.0"; + } + + CORBA_IDLType* @@ -10102,7 +10103,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:55:58 */ +-/* starting time is 17:22:30 */ +/* starting time is 12:14:19 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup */ @@ -101,8 +514,50 @@ } return 0; } --/* ending time is 15:55:58 */ +-/* ending time is 17:22:30 */ +/* ending time is 12:14:19 */ static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -10473,10 +10474,10 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -10487,13 +10488,13 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -10507,7 +10508,7 @@ + + const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_TypedefDef:1.0"; ++ return "IDL:omg.org/CORBA/TypedefDef:1.0"; + } + + CORBA_TypedefDef* diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff index 2a28fa177f5..4aaacd4d2c0 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff @@ -1,5 +1,5 @@ ---- orig/IFR_BasicS.cpp Mon Apr 23 20:56:03 2001 -+++ IFR_BasicS.cpp Mon Apr 23 21:28:43 2001 +--- orig/IFR_BasicS.cpp Mon Apr 30 22:22:33 2001 ++++ IFR_BasicS.cpp Fri May 11 00:01:55 2001 @@ -1,6 +1,6 @@ // -*- C++ -*- // @@ -8,11 +8,22 @@ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: +@@ -19,8 +19,8 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_IFR_BASICS_CPP_ +-#define _TAO_IDL_IFR_BASICS_CPP_ ++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_ ++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_ + + #include "IFR_BasicS.h" + @@ -51,7 +51,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:32 */ +/* starting time is 13:56:20 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup */ @@ -21,16 +32,125 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:32 */ +/* ending time is 13:56:20 */ static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -1444,7 +1444,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->lookup_id ( + search_id, +@@ -1477,7 +1477,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->get_canonical_typecode ( + tc, +@@ -1510,7 +1510,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->get_primitive ( + kind, +@@ -1543,7 +1543,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->create_string ( + bound, +@@ -1576,7 +1576,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->create_wstring ( + bound, +@@ -1610,7 +1610,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->create_sequence ( + bound, +@@ -1645,7 +1645,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->create_array ( + length, +@@ -1680,7 +1680,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_Repository_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_Repository:1.0" ++ "IDL:omg.org/CORBA/Repository:1.0" + ) + )->create_fixed ( + digits, +@@ -2532,9 +2532,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -2545,11 +2545,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0) + return ACE_static_cast (POA_CORBA_Repository_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -2563,7 +2563,7 @@ + + const char* POA_CORBA_Repository::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_Repository:1.0"; ++ return "IDL:omg.org/CORBA/Repository:1.0"; + } + + CORBA_Repository* @@ -2591,7 +2591,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:32 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup */ @@ -39,16 +159,58 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:32 */ +/* ending time is 13:56:21 */ static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -2980,10 +2980,10 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -2994,13 +2994,13 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -3014,7 +3014,7 @@ + + const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ModuleDef:1.0"; ++ return "IDL:omg.org/CORBA/ModuleDef:1.0"; + } + + CORBA_ModuleDef* @@ -3042,7 +3042,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:32 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup */ @@ -57,16 +219,98 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:32 */ +/* ending time is 13:56:21 */ static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -3935,7 +3935,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ConstantDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ConstantDef:1.0" ++ "IDL:omg.org/CORBA/ConstantDef:1.0" + ) + )->type ( + ACE_TRY_ENV +@@ -3966,7 +3966,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ConstantDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ConstantDef:1.0" ++ "IDL:omg.org/CORBA/ConstantDef:1.0" + ) + )->type_def ( + ACE_TRY_ENV +@@ -3996,7 +3996,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ConstantDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ConstantDef:1.0" ++ "IDL:omg.org/CORBA/ConstantDef:1.0" + ) + )->type_def ( + type_def, +@@ -4029,7 +4029,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ConstantDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ConstantDef:1.0" ++ "IDL:omg.org/CORBA/ConstantDef:1.0" + ) + )->value ( + ACE_TRY_ENV +@@ -4059,7 +4059,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ConstantDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ConstantDef:1.0" ++ "IDL:omg.org/CORBA/ConstantDef:1.0" + ) + )->value ( + value, +@@ -4585,9 +4585,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -4598,11 +4598,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ConstantDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -4616,7 +4616,7 @@ + + const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ConstantDef:1.0"; ++ return "IDL:omg.org/CORBA/ConstantDef:1.0"; + } + + CORBA_ConstantDef* @@ -4644,7 +4644,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup */ @@ -75,16 +319,86 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -5186,7 +5186,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_StructDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_StructDef:1.0" ++ "IDL:omg.org/CORBA/StructDef:1.0" + ) + )->members ( + ACE_TRY_ENV +@@ -5216,7 +5216,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_StructDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_StructDef:1.0" ++ "IDL:omg.org/CORBA/StructDef:1.0" + ) + )->members ( + members, +@@ -5506,12 +5506,12 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -5522,17 +5522,17 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_StructDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -5546,7 +5546,7 @@ + + const char* POA_CORBA_StructDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_StructDef:1.0"; ++ return "IDL:omg.org/CORBA/StructDef:1.0"; + } + + CORBA_StructDef* @@ -5574,7 +5574,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup */ @@ -93,16 +407,113 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -6488,7 +6488,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_UnionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_UnionDef:1.0" ++ "IDL:omg.org/CORBA/UnionDef:1.0" + ) + )->discriminator_type ( + ACE_TRY_ENV +@@ -6519,7 +6519,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_UnionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_UnionDef:1.0" ++ "IDL:omg.org/CORBA/UnionDef:1.0" + ) + )->discriminator_type_def ( + ACE_TRY_ENV +@@ -6549,7 +6549,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_UnionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_UnionDef:1.0" ++ "IDL:omg.org/CORBA/UnionDef:1.0" + ) + )->discriminator_type_def ( + discriminator_type_def, +@@ -6582,7 +6582,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_UnionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_UnionDef:1.0" ++ "IDL:omg.org/CORBA/UnionDef:1.0" + ) + )->members ( + ACE_TRY_ENV +@@ -6612,7 +6612,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_UnionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_UnionDef:1.0" ++ "IDL:omg.org/CORBA/UnionDef:1.0" + ) + )->members ( + members, +@@ -7141,12 +7141,12 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -7157,17 +7157,17 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_UnionDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -7181,7 +7181,7 @@ + + const char* POA_CORBA_UnionDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_UnionDef:1.0"; ++ return "IDL:omg.org/CORBA/UnionDef:1.0"; + } + + CORBA_UnionDef* @@ -7209,7 +7209,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup */ @@ -111,16 +522,81 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -7732,7 +7732,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_EnumDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_EnumDef:1.0" ++ "IDL:omg.org/CORBA/EnumDef:1.0" + ) + )->members ( + ACE_TRY_ENV +@@ -7762,7 +7762,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_EnumDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_EnumDef:1.0" ++ "IDL:omg.org/CORBA/EnumDef:1.0" + ) + )->members ( + members, +@@ -8051,11 +8051,11 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -8066,15 +8066,15 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_EnumDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -8088,7 +8088,7 @@ + + const char* POA_CORBA_EnumDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_EnumDef:1.0"; ++ return "IDL:omg.org/CORBA/EnumDef:1.0"; + } + + CORBA_EnumDef* @@ -8116,7 +8116,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup */ @@ -129,16 +605,81 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -8639,7 +8639,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_AliasDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AliasDef:1.0" ++ "IDL:omg.org/CORBA/AliasDef:1.0" + ) + )->original_type_def ( + ACE_TRY_ENV +@@ -8669,7 +8669,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_AliasDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AliasDef:1.0" ++ "IDL:omg.org/CORBA/AliasDef:1.0" + ) + )->original_type_def ( + original_type_def, +@@ -8958,11 +8958,11 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -8973,15 +8973,15 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_AliasDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -8995,7 +8995,7 @@ + + const char* POA_CORBA_AliasDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_AliasDef:1.0"; ++ return "IDL:omg.org/CORBA/AliasDef:1.0"; + } + + CORBA_AliasDef* @@ -9023,7 +9023,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup */ @@ -147,16 +688,63 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -9395,11 +9395,11 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -9410,15 +9410,15 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_NativeDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -9432,7 +9432,7 @@ + + const char* POA_CORBA_NativeDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_NativeDef:1.0"; ++ return "IDL:omg.org/CORBA/NativeDef:1.0"; + } + + CORBA_NativeDef* @@ -9460,7 +9460,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup */ @@ -165,16 +753,62 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -9828,7 +9828,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_PrimitiveDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_PrimitiveDef:1.0" ++ "IDL:omg.org/CORBA/PrimitiveDef:1.0" + ) + )->kind ( + ACE_TRY_ENV +@@ -10033,9 +10033,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -10046,11 +10046,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_PrimitiveDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -10064,7 +10064,7 @@ + + const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_PrimitiveDef:1.0"; ++ return "IDL:omg.org/CORBA/PrimitiveDef:1.0"; + } + + CORBA_PrimitiveDef* @@ -10092,7 +10092,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:02 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup */ @@ -183,16 +817,71 @@ } return 0; } --/* ending time is 15:56:02 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -10602,7 +10602,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_StringDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_StringDef:1.0" ++ "IDL:omg.org/CORBA/StringDef:1.0" + ) + )->bound ( + ACE_TRY_ENV +@@ -10632,7 +10632,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_StringDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_StringDef:1.0" ++ "IDL:omg.org/CORBA/StringDef:1.0" + ) + )->bound ( + bound, +@@ -10918,9 +10918,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -10931,11 +10931,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_StringDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -10949,7 +10949,7 @@ + + const char* POA_CORBA_StringDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_StringDef:1.0"; ++ return "IDL:omg.org/CORBA/StringDef:1.0"; + } + + CORBA_StringDef* @@ -10977,7 +10977,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup */ @@ -201,16 +890,71 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -11487,7 +11487,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_WstringDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_WstringDef:1.0" ++ "IDL:omg.org/CORBA/WstringDef:1.0" + ) + )->bound ( + ACE_TRY_ENV +@@ -11517,7 +11517,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_WstringDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_WstringDef:1.0" ++ "IDL:omg.org/CORBA/WstringDef:1.0" + ) + )->bound ( + bound, +@@ -11803,9 +11803,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -11816,11 +11816,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_WstringDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -11834,7 +11834,7 @@ + + const char* POA_CORBA_WstringDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_WstringDef:1.0"; ++ return "IDL:omg.org/CORBA/WstringDef:1.0"; + } + + CORBA_WstringDef* @@ -11862,7 +11862,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup */ @@ -349,16 +1093,98 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -12744,7 +12741,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_SequenceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_SequenceDef:1.0" ++ "IDL:omg.org/CORBA/SequenceDef:1.0" + ) + )->bound ( + ACE_TRY_ENV +@@ -12774,7 +12771,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_SequenceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_SequenceDef:1.0" ++ "IDL:omg.org/CORBA/SequenceDef:1.0" + ) + )->bound ( + bound, +@@ -12807,7 +12804,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_SequenceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_SequenceDef:1.0" ++ "IDL:omg.org/CORBA/SequenceDef:1.0" + ) + )->element_type ( + ACE_TRY_ENV +@@ -12838,7 +12835,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_SequenceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_SequenceDef:1.0" ++ "IDL:omg.org/CORBA/SequenceDef:1.0" + ) + )->element_type_def ( + ACE_TRY_ENV +@@ -12868,7 +12865,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_SequenceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_SequenceDef:1.0" ++ "IDL:omg.org/CORBA/SequenceDef:1.0" + ) + )->element_type_def ( + element_type_def, +@@ -13393,9 +13390,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -13406,11 +13403,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_SequenceDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -13424,7 +13421,7 @@ + + const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_SequenceDef:1.0"; ++ return "IDL:omg.org/CORBA/SequenceDef:1.0"; + } + + CORBA_SequenceDef* @@ -13452,7 +13449,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup */ @@ -367,16 +1193,98 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -14334,7 +14331,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ArrayDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ArrayDef:1.0" ++ "IDL:omg.org/CORBA/ArrayDef:1.0" + ) + )->length ( + ACE_TRY_ENV +@@ -14364,7 +14361,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ArrayDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ArrayDef:1.0" ++ "IDL:omg.org/CORBA/ArrayDef:1.0" + ) + )->length ( + length, +@@ -14397,7 +14394,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ArrayDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ArrayDef:1.0" ++ "IDL:omg.org/CORBA/ArrayDef:1.0" + ) + )->element_type ( + ACE_TRY_ENV +@@ -14428,7 +14425,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ArrayDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ArrayDef:1.0" ++ "IDL:omg.org/CORBA/ArrayDef:1.0" + ) + )->element_type_def ( + ACE_TRY_ENV +@@ -14458,7 +14455,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ArrayDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ArrayDef:1.0" ++ "IDL:omg.org/CORBA/ArrayDef:1.0" + ) + )->element_type_def ( + element_type_def, +@@ -14983,9 +14980,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -14996,11 +14993,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ArrayDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -15014,7 +15011,7 @@ + + const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ArrayDef:1.0"; ++ return "IDL:omg.org/CORBA/ArrayDef:1.0"; + } + + CORBA_ArrayDef* @@ -15042,7 +15039,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup */ @@ -385,16 +1293,85 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -15707,7 +15704,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ExceptionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ExceptionDef:1.0" ++ "IDL:omg.org/CORBA/ExceptionDef:1.0" + ) + )->type ( + ACE_TRY_ENV +@@ -15738,7 +15735,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ExceptionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ExceptionDef:1.0" ++ "IDL:omg.org/CORBA/ExceptionDef:1.0" + ) + )->members ( + ACE_TRY_ENV +@@ -15768,7 +15765,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ExceptionDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ExceptionDef:1.0" ++ "IDL:omg.org/CORBA/ExceptionDef:1.0" + ) + )->members ( + members, +@@ -16136,10 +16133,10 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -16150,13 +16147,13 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ExceptionDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -16170,7 +16167,7 @@ + + const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ExceptionDef:1.0"; ++ return "IDL:omg.org/CORBA/ExceptionDef:1.0"; + } + + CORBA_ExceptionDef* @@ -16198,7 +16195,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup */ @@ -403,16 +1380,98 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -17092,7 +17089,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_AttributeDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AttributeDef:1.0" ++ "IDL:omg.org/CORBA/AttributeDef:1.0" + ) + )->type ( + ACE_TRY_ENV +@@ -17123,7 +17120,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_AttributeDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AttributeDef:1.0" ++ "IDL:omg.org/CORBA/AttributeDef:1.0" + ) + )->type_def ( + ACE_TRY_ENV +@@ -17153,7 +17150,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_AttributeDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AttributeDef:1.0" ++ "IDL:omg.org/CORBA/AttributeDef:1.0" + ) + )->type_def ( + type_def, +@@ -17186,7 +17183,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_AttributeDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AttributeDef:1.0" ++ "IDL:omg.org/CORBA/AttributeDef:1.0" + ) + )->mode ( + ACE_TRY_ENV +@@ -17216,7 +17213,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_AttributeDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_AttributeDef:1.0" ++ "IDL:omg.org/CORBA/AttributeDef:1.0" + ) + )->mode ( + mode, +@@ -17741,9 +17738,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -17754,11 +17751,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_AttributeDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -17772,7 +17769,7 @@ + + const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_AttributeDef:1.0"; ++ return "IDL:omg.org/CORBA/AttributeDef:1.0"; + } + + CORBA_AttributeDef* @@ -17800,7 +17797,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup */ @@ -421,16 +1480,152 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -19489,7 +19486,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->result ( + ACE_TRY_ENV +@@ -19520,7 +19517,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->result_def ( + ACE_TRY_ENV +@@ -19550,7 +19547,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->result_def ( + result_def, +@@ -19583,7 +19580,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->params ( + ACE_TRY_ENV +@@ -19613,7 +19610,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->params ( + params, +@@ -19646,7 +19643,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->mode ( + ACE_TRY_ENV +@@ -19676,7 +19673,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->mode ( + mode, +@@ -19709,7 +19706,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->contexts ( + ACE_TRY_ENV +@@ -19739,7 +19736,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->contexts ( + contexts, +@@ -19772,7 +19769,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->exceptions ( + ACE_TRY_ENV +@@ -19802,7 +19799,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_OperationDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_OperationDef:1.0" ++ "IDL:omg.org/CORBA/OperationDef:1.0" + ) + )->exceptions ( + exceptions, +@@ -20804,9 +20801,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -20817,11 +20814,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_OperationDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -20835,7 +20832,7 @@ + + const char* POA_CORBA_OperationDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_OperationDef:1.0"; ++ return "IDL:omg.org/CORBA/OperationDef:1.0"; + } + + CORBA_OperationDef* @@ -20863,7 +20860,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup */ @@ -439,16 +1634,117 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -22041,7 +22038,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_InterfaceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_InterfaceDef:1.0" ++ "IDL:omg.org/CORBA/InterfaceDef:1.0" + ) + )->base_interfaces ( + ACE_TRY_ENV +@@ -22071,7 +22068,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_InterfaceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_InterfaceDef:1.0" ++ "IDL:omg.org/CORBA/InterfaceDef:1.0" + ) + )->base_interfaces ( + base_interfaces, +@@ -22105,7 +22102,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_InterfaceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_InterfaceDef:1.0" ++ "IDL:omg.org/CORBA/InterfaceDef:1.0" + ) + )->is_a ( + interface_id, +@@ -22137,7 +22134,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_InterfaceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_InterfaceDef:1.0" ++ "IDL:omg.org/CORBA/InterfaceDef:1.0" + ) + )->describe_interface ( + ACE_TRY_ENV +@@ -22173,7 +22170,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_InterfaceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_InterfaceDef:1.0" ++ "IDL:omg.org/CORBA/InterfaceDef:1.0" + ) + )->create_attribute ( + id, +@@ -22217,7 +22214,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_InterfaceDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_InterfaceDef:1.0" ++ "IDL:omg.org/CORBA/InterfaceDef:1.0" + ) + )->create_operation ( + id, +@@ -22902,11 +22899,11 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -22917,15 +22914,15 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -22939,7 +22936,7 @@ + + const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_InterfaceDef:1.0"; ++ return "IDL:omg.org/CORBA/InterfaceDef:1.0"; + } + + CORBA_InterfaceDef* @@ -22967,7 +22964,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:21 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup */ @@ -457,16 +1753,68 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:21 */ static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -23366,12 +23363,12 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -23382,17 +23379,17 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -23406,7 +23403,7 @@ + + const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0"; ++ return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"; + } + + CORBA_AbstractInterfaceDef* @@ -23434,7 +23431,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:03 */ +-/* starting time is 17:22:33 */ +/* starting time is 13:56:22 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup */ @@ -475,8 +1823,60 @@ } return 0; } --/* ending time is 15:56:03 */ +-/* ending time is 17:22:33 */ +/* ending time is 13:56:22 */ static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -23833,12 +23830,12 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -23849,17 +23846,17 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -23873,7 +23870,7 @@ + + const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0"; ++ return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"; + } + + CORBA_LocalInterfaceDef* diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff index 8c64f211385..0db2951b717 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff @@ -1,5 +1,5 @@ --- orig/IFR_ComponentsS.cpp Mon Apr 30 22:22:39 2001 -+++ IFR_ComponentsS.cpp Thu May 10 20:43:22 2001 ++++ IFR_ComponentsS.cpp Fri May 11 00:03:05 2001 @@ -1,6 +1,6 @@ // -*- C++ -*- // @@ -329,14 +329,16 @@ static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) -@@ -8981,10 +8981,10 @@ +@@ -8980,11 +8980,11 @@ + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -344,9 +346,12 @@ (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else -@@ -8999,13 +8999,13 @@ +@@ -8997,15 +8997,15 @@ + { + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0) return ACE_static_cast (POA_IR::ComponentDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) @@ -421,20 +426,25 @@ static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) -@@ -10400,8 +10400,8 @@ +@@ -10399,9 +10399,9 @@ + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else -@@ -10416,9 +10416,9 @@ +@@ -10414,11 +10414,11 @@ + { + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0) return ACE_static_cast (POA_IR::FactoryDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0) return ACE_static_cast (POA_CORBA_OperationDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) @@ -462,20 +472,25 @@ static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) -@@ -10894,8 +10894,8 @@ +@@ -10893,9 +10893,9 @@ + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else -@@ -10910,9 +10910,9 @@ +@@ -10908,11 +10908,11 @@ + { + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0) return ACE_static_cast (POA_IR::FinderDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0) return ACE_static_cast (POA_CORBA_OperationDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) @@ -503,14 +518,16 @@ static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) -@@ -13706,10 +13706,10 @@ +@@ -13705,11 +13705,11 @@ + if ( (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || @@ -518,9 +535,12 @@ (!ACE_OS::strcmp ((char *)value, base_id))) return 1; else -@@ -13724,13 +13724,13 @@ +@@ -13722,15 +13722,15 @@ + { + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0) return ACE_static_cast (POA_IR::HomeDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0) return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this); - if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff index e6125df97ba..9efdc466dc5 100644 --- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff +++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff @@ -1,5 +1,5 @@ ---- orig/IFR_ExtendedS.cpp Mon Apr 23 20:56:05 2001 -+++ IFR_ExtendedS.cpp Mon Apr 23 20:30:23 2001 +--- orig/IFR_ExtendedS.cpp Mon Apr 30 22:22:36 2001 ++++ IFR_ExtendedS.cpp Fri May 11 00:03:12 2001 @@ -1,6 +1,6 @@ // -*- C++ -*- // @@ -8,11 +8,22 @@ // **** Code generated by the The ACE ORB (TAO) IDL Compiler **** // TAO and the TAO IDL Compiler have been developed by: +@@ -19,8 +19,8 @@ + // Information about TAO is available at: + // http://www.cs.wustl.edu/~schmidt/TAO.html + +-#ifndef _TAO_IDL_IFR_EXTENDEDS_CPP_ +-#define _TAO_IDL_IFR_EXTENDEDS_CPP_ ++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_ ++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_ + + #include "IFR_ExtendedS.h" + @@ -51,7 +51,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:05 */ +-/* starting time is 17:22:35 */ +/* starting time is 13:56:24 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup */ @@ -21,16 +32,89 @@ } return 0; } --/* ending time is 15:56:05 */ +-/* ending time is 17:22:35 */ +/* ending time is 13:56:24 */ static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -808,7 +808,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_FixedDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_FixedDef:1.0" ++ "IDL:omg.org/CORBA/FixedDef:1.0" + ) + )->digits ( + ACE_TRY_ENV +@@ -838,7 +838,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_FixedDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_FixedDef:1.0" ++ "IDL:omg.org/CORBA/FixedDef:1.0" + ) + )->digits ( + digits, +@@ -871,7 +871,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_FixedDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_FixedDef:1.0" ++ "IDL:omg.org/CORBA/FixedDef:1.0" + ) + )->scale ( + ACE_TRY_ENV +@@ -901,7 +901,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_FixedDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_FixedDef:1.0" ++ "IDL:omg.org/CORBA/FixedDef:1.0" + ) + )->scale ( + scale, +@@ -1345,9 +1345,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -1358,11 +1358,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_FixedDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -1376,7 +1376,7 @@ + + const char* POA_CORBA_FixedDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_FixedDef:1.0"; ++ return "IDL:omg.org/CORBA/FixedDef:1.0"; + } + + CORBA_FixedDef* @@ -1404,7 +1404,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:05 */ +-/* starting time is 17:22:35 */ +/* starting time is 13:56:24 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup */ @@ -39,16 +123,98 @@ } return 0; } --/* ending time is 15:56:05 */ +-/* ending time is 17:22:35 */ +/* ending time is 13:56:24 */ static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -2297,7 +2297,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueMemberDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueMemberDef:1.0" ++ "IDL:omg.org/CORBA/ValueMemberDef:1.0" + ) + )->type ( + ACE_TRY_ENV +@@ -2328,7 +2328,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueMemberDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueMemberDef:1.0" ++ "IDL:omg.org/CORBA/ValueMemberDef:1.0" + ) + )->type_def ( + ACE_TRY_ENV +@@ -2358,7 +2358,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueMemberDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueMemberDef:1.0" ++ "IDL:omg.org/CORBA/ValueMemberDef:1.0" + ) + )->type_def ( + type_def, +@@ -2391,7 +2391,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueMemberDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueMemberDef:1.0" ++ "IDL:omg.org/CORBA/ValueMemberDef:1.0" + ) + )->access ( + ACE_TRY_ENV +@@ -2421,7 +2421,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueMemberDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueMemberDef:1.0" ++ "IDL:omg.org/CORBA/ValueMemberDef:1.0" + ) + )->access ( + access, +@@ -2946,9 +2946,9 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -2959,11 +2959,11 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ValueMemberDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -2977,7 +2977,7 @@ + + const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ValueMemberDef:1.0"; ++ return "IDL:omg.org/CORBA/ValueMemberDef:1.0"; + } + + CORBA_ValueMemberDef* @@ -3005,7 +3005,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:05 */ +-/* starting time is 17:22:35 */ +/* starting time is 13:56:24 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup */ @@ -57,16 +223,234 @@ } return 0; } --/* ending time is 15:56:05 */ +-/* ending time is 17:22:35 */ +/* ending time is 13:56:24 */ static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -5841,7 +5841,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->supported_interfaces ( + ACE_TRY_ENV +@@ -5871,7 +5871,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->supported_interfaces ( + supported_interfaces, +@@ -5904,7 +5904,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->initializers ( + ACE_TRY_ENV +@@ -5934,7 +5934,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->initializers ( + initializers, +@@ -5967,7 +5967,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->base_value ( + ACE_TRY_ENV +@@ -5997,7 +5997,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->base_value ( + base_value, +@@ -6030,7 +6030,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->abstract_base_values ( + ACE_TRY_ENV +@@ -6060,7 +6060,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->abstract_base_values ( + abstract_base_values, +@@ -6093,7 +6093,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_abstract ( + ACE_TRY_ENV +@@ -6123,7 +6123,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_abstract ( + is_abstract, +@@ -6156,7 +6156,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_custom ( + ACE_TRY_ENV +@@ -6186,7 +6186,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_custom ( + is_custom, +@@ -6219,7 +6219,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_truncatable ( + ACE_TRY_ENV +@@ -6249,7 +6249,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_truncatable ( + is_truncatable, +@@ -6283,7 +6283,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->is_a ( + id, +@@ -6315,7 +6315,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->describe_value ( + ACE_TRY_ENV +@@ -6351,7 +6351,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->create_value_member ( + id, +@@ -6392,7 +6392,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->create_attribute ( + id, +@@ -6436,7 +6436,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueDef:1.0" ++ "IDL:omg.org/CORBA/ValueDef:1.0" + ) + )->create_operation ( + id, +@@ -8177,11 +8177,11 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -8192,15 +8192,15 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ValueDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0) + return ACE_static_cast (POA_CORBA_Container_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -8214,7 +8214,7 @@ + + const char* POA_CORBA_ValueDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ValueDef:1.0"; ++ return "IDL:omg.org/CORBA/ValueDef:1.0"; + } + + CORBA_ValueDef* @@ -8242,7 +8242,7 @@ public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; --/* starting time is 15:56:05 */ +-/* starting time is 17:22:35 */ +/* starting time is 13:56:24 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup */ @@ -75,8 +459,73 @@ } return 0; } --/* ending time is 15:56:05 */ +-/* ending time is 17:22:35 */ +/* ending time is 13:56:24 */ static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable; #if (TAO_HAS_INTERCEPTORS == 1) +@@ -8765,7 +8765,7 @@ + return ACE_reinterpret_cast ( + POA_CORBA_ValueBoxDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueBoxDef:1.0" ++ "IDL:omg.org/CORBA/ValueBoxDef:1.0" + ) + )->original_type_def ( + ACE_TRY_ENV +@@ -8795,7 +8795,7 @@ + ACE_reinterpret_cast ( + POA_CORBA_ValueBoxDef_ptr, + servant_upcall.servant ()->_downcast ( +- "IDL:omg.org/CORBA_ValueBoxDef:1.0" ++ "IDL:omg.org/CORBA/ValueBoxDef:1.0" + ) + )->original_type_def ( + original_type_def, +@@ -9084,11 +9084,11 @@ + ACE_CHECK_RETURN (0); + + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) || +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) || + (!ACE_OS::strcmp ((char *)value, base_id))) + return 1; + else +@@ -9099,15 +9099,15 @@ + const char* logical_type_id + ) + { +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_ValueBoxDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0) + return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0) + return ACE_static_cast (POA_CORBA_Contained_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0) + return ACE_static_cast (POA_CORBA_IDLType_ptr, this); +- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0) ++ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0) + return ACE_static_cast (POA_CORBA_IRObject_ptr, this); + if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0) + return ACE_static_cast(PortableServer::Servant, this); +@@ -9121,7 +9121,7 @@ + + const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_ValueBoxDef:1.0"; ++ return "IDL:omg.org/CORBA/ValueBoxDef:1.0"; + } + + CORBA_ValueBoxDef* |