diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-05-01 18:30:39 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-05-01 18:30:39 +0000 |
| commit | 97c1df7ffac788c1e21bb11275a3a812e4dcb473 (patch) | |
| tree | 1bd6149e80b6a9a18b34839bbc391e135f204f6f | |
| parent | b45b2a1f692f399d7c22acda3dd9cdd993ce6219 (diff) | |
| download | ATCD-97c1df7ffac788c1e21bb11275a3a812e4dcb473.tar.gz | |
ChangeLogTag:Thu May 1 11:25:42 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
85 files changed, 1022 insertions, 891 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aab91b2821a..2a2837a9401 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,134 @@ +Thu May 1 11:25:42 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_visitor_component/component_ch.cpp: + * TAO_IDL/be/be_visitor_component/component_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h: + * tao/AbstractBase.cpp: + * tao/AbstractBase.h: + * tao/AbstractBase.inl: + * tao/Any.cpp: + * tao/ClientRequestInfo_i.cpp: + * tao/CurrentC.cpp: + * tao/CurrentC.h: + * tao/DomainC.cpp: + * tao/DomainC.h: + * tao/Exception.h: + * tao/GIOP_Message_Generator_Parser_10.cpp: + * tao/IOP_CodecC.cpp: + * tao/IOP_CodecC.h: + * tao/LocalObject.cpp: + * tao/LocalObject.i: + * tao/NVList.cpp: + * tao/NVList.h: + * tao/ORBInitInfo.cpp: + * tao/ORBInitInfo.h: + * tao/Object.cpp: + * tao/Object.h: + * tao/ObjectReferenceTemplateC.cpp: + * tao/ObjectReferenceTemplateC.h: + * tao/Pluggable_Messaging_Utils.h: + * tao/PolicyC.cpp: + * tao/PolicyC.h: + * tao/PollableC.cpp: + * tao/PollableC.h: + * tao/PortableInterceptorC.cpp: + * tao/PortableInterceptorC.h: + * tao/TAOC.cpp: + * tao/TAOC.h: + * tao/TAO_Server_Request.h: + * tao/TAO_Server_Request.i: + * tao/ValueBase.cpp: + * tao/ValueBase.h: + * tao/BiDir_GIOP/BiDirPolicyC.cpp: + * tao/BiDir_GIOP/BiDirPolicyC.h: + * tao/DynamicAny/DynAny_i.cpp: + * tao/DynamicAny/DynAny_i.h: + * tao/DynamicAny/DynArray_i.cpp: + * tao/DynamicAny/DynArray_i.h: + * tao/DynamicAny/DynEnum_i.cpp: + * tao/DynamicAny/DynEnum_i.h: + * tao/DynamicAny/DynSequence_i.cpp: + * tao/DynamicAny/DynSequence_i.h: + * tao/DynamicAny/DynStruct_i.cpp: + * tao/DynamicAny/DynStruct_i.h: + * tao/DynamicAny/DynUnion_i.cpp: + * tao/DynamicAny/DynUnion_i.h: + * tao/DynamicAny/DynamicAnyC.cpp: + * tao/DynamicAny/DynamicAnyC.h: + * tao/IFR_Client/IFR_BaseC.cpp: + * tao/IFR_Client/IFR_BaseC.h: + * tao/IFR_Client/IFR_BasicC.cpp: + * tao/IFR_Client/IFR_BasicC.h: + * tao/IFR_Client/IFR_ComponentsC.cpp: + * tao/IFR_Client/IFR_ComponentsC.h: + * tao/IFR_Client/IFR_ExtendedC.cpp: + * tao/IFR_Client/IFR_ExtendedC.h: + * tao/IORManipulation/IORC.cpp: + * tao/IORManipulation/IORC.h: + * tao/IORTable/IORTableC.cpp: + * tao/IORTable/IORTableC.h: + * tao/Messaging/MessagingC.cpp: + * tao/Messaging/MessagingC.h: + * tao/Messaging/Messaging_No_ImplC.cpp: + * tao/Messaging/Messaging_No_ImplC.h: + * tao/Messaging/Messaging_RT_PolicyC.cpp: + * tao/Messaging/Messaging_RT_PolicyC.h: + * tao/Messaging/Messaging_SyncScope_PolicyC.cpp: + * tao/Messaging/Messaging_SyncScope_PolicyC.h: + * tao/Messaging/TAO_ExtC.cpp: + * tao/Messaging/TAO_ExtC.h: + * tao/PortableServer/Collocated_Object.cpp: + * tao/PortableServer/Collocated_Object.h: + * tao/PortableServer/Default_ORTC.cpp: + * tao/PortableServer/Default_ORTC.h: + * tao/PortableServer/ImR_LocatorC.cpp: + * tao/PortableServer/ImR_LocatorC.h: + * tao/PortableServer/ImplRepoC.cpp: + * tao/PortableServer/ImplRepoC.h: + * tao/PortableServer/POAManager.i: + * tao/PortableServer/PortableServerC.cpp: + * tao/PortableServer/PortableServerC.h: + * tao/PortableServer/Servant_Base.i: + * tao/PortableServer/ServerRequestInfo.cpp: + * tao/RTCORBA/Network_Priority_Mapping_Manager.cpp: + * tao/RTCORBA/Network_Priority_Mapping_Manager.h: + * tao/RTCORBA/Priority_Mapping_Manager.cpp: + * tao/RTCORBA/Priority_Mapping_Manager.h: + * tao/RTCORBA/RTCORBAC.cpp: + * tao/RTCORBA/RTCORBAC.h: + * tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp: + * tao/RTPortableServer/RTPortableServerC.cpp: + * tao/RTPortableServer/RTPortableServerC.h: + * tao/TypeCodeFactory/TypeCodeFactoryC.cpp: + * tao/TypeCodeFactory/TypeCodeFactoryC.h: + * tao/TypeCodeFactory/TypeCodeFactory_i.cpp: + * tao/TypeCodeFactory/TypeCodeFactory_i.h: + + Changed all uses of ptr_arith_t to ptrdiff_t. Addresses 64 bit + platform issues. Thanks to Steve Huston <shuston@riverace.com> + for suggesting this change. + + * tao/Exception.h: + + Updated author information. + + * tao/Pseudo_VarOut_T.h: + + Nuked trailing whitespace. + Thu May 01 10:35:03 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp (encode_endpoints): diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 4c663f6d508..0676b799e1e 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1608,7 +1608,7 @@ be_interface::queryinterface_helper (be_interface *derived, // Emit the comparison code. *os << "(type == ACE_reinterpret_cast (" << be_idt << be_idt <<be_idt << be_idt << be_idt << be_idt_nl - << "ptr_arith_t," << be_nl; + << "ptrdiff_t," << be_nl; be_decl *scope = be_scope::narrow_from_scope (ancestor->defined_in ())->decl (); diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp index ace94f139e7..8d53201ecf5 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp @@ -159,7 +159,7 @@ be_visitor_component_ch::visit_component (be_component *node) // The _tao_QueryInterface method. *os << be_nl << be_nl - << "virtual void *_tao_QueryInterface (ptr_arith_t type);"; + << "virtual void *_tao_QueryInterface (ptrdiff_t type);"; // The _interface_repository_id method. *os << be_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp index cc9730f2d8b..e0e5af9ea7b 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp @@ -358,7 +358,7 @@ be_visitor_component_cs::visit_component (be_component *node) // Generating _tao_QueryInterface method. *os << "void *" << node->full_name () - << "::_tao_QueryInterface (ptr_arith_t type)" << be_nl + << "::_tao_QueryInterface (ptrdiff_t type)" << be_nl << "{" << be_idt_nl << "void *retv = 0;" << be_nl << be_nl << "if "; @@ -377,7 +377,7 @@ be_visitor_component_cs::visit_component (be_component *node) *os << "(type == ACE_reinterpret_cast (" << be_idt << be_idt << be_idt << be_idt << be_idt << be_idt_nl - << " ptr_arith_t," << be_nl; + << " ptrdiff_t," << be_nl; if (node->is_abstract ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 8d6075fd520..e8bd2a0255a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -229,7 +229,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) } // The _tao_QueryInterface method. - *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);" + *os << "virtual void *_tao_QueryInterface (ptrdiff_t type);" << be_nl << be_nl; // The _interface_repository_id method. @@ -241,10 +241,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node) if (node->is_abstract ()) { *os << be_nl << be_nl - << "virtual void *_tao_obv_narrow (ptr_arith_t type_id);" + << "virtual void *_tao_obv_narrow (ptrdiff_t type_id);" << "\n#if defined (_MSC_VER)" << be_nl << "virtual void *" << node->flat_name () - << "_tao_obv_narrow (ptr_arith_t type_id);" + << "_tao_obv_narrow (ptrdiff_t type_id);" << "\n#endif /* _MSC_VER */"; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 685674b6236..e61a9214ad8 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -422,23 +422,23 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "return " << node->local_name () << "::_nil ();" << be_uidt_nl << "}" << be_uidt_nl << be_nl << "return (" << node->local_name () - << "_ptr) abs->_tao_obv_narrow ((ptr_arith_t) &_downcast);" + << "_ptr) abs->_tao_obv_narrow ((ptrdiff_t) &_downcast);" << be_uidt_nl << "}" << be_nl << be_nl; *os << "\n#if defined (_MSC_VER)" << be_nl << "void *" << be_nl << node->name () << "::" << node->flat_name () - << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "_tao_obv_narrow (ptrdiff_t type_id)" << be_nl << "{" << be_idt_nl << "return this->_tao_obv_narrow (type_id);" << be_uidt_nl << "}" << "\n#endif /* _MSC_VER */" << be_uidt_nl << be_nl << "void *" << be_nl << node->full_name () - << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "::_tao_obv_narrow (ptrdiff_t type_id)" << be_nl << "{" << be_idt_nl - << "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl + << "if (type_id == (ptrdiff_t) &_downcast)" << be_idt_nl << "{" << be_idt_nl << "return this;" << be_uidt_nl << "}" << be_uidt_nl << be_nl @@ -566,7 +566,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) // Generating _tao_QueryInterface method. *os << "void *" << node->full_name () - << "::_tao_QueryInterface (ptr_arith_t type)" << be_nl + << "::_tao_QueryInterface (ptrdiff_t type)" << be_nl << "{" << be_idt_nl << "void *retv = 0;" << be_nl << be_nl << "if "; @@ -585,7 +585,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << "(type == ACE_reinterpret_cast (" << be_idt << be_idt << be_idt << be_idt << be_idt << be_idt_nl - << " ptr_arith_t," << be_nl; + << " ptrdiff_t," << be_nl; if (node->is_abstract ()) { @@ -878,7 +878,7 @@ be_visitor_interface_cs::gen_concrete_unchecked_narrow (be_interface *node, << node->local_name () << "_ptr," << be_nl << "obj->_tao_QueryInterface (" << be_idt << be_idt_nl << "ACE_reinterpret_cast (" << be_idt << be_idt_nl - << "ptr_arith_t," << be_nl + << "ptrdiff_t," << be_nl << "&" << node->local_name () << "::_tao_class_id" << be_uidt_nl << ")" << be_uidt << be_uidt_nl << ")" << be_uidt << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp index c062e2825ce..b0d07a033b0 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp @@ -88,7 +88,7 @@ be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node) << node->full_name () << " *," << be_nl << "_tao_valuetype" << be_uidt_nl << ")," << be_uidt_nl - << "(ptr_arith_t) &" << node->full_name () <<"::_downcast" + << "(ptrdiff_t) &" << node->full_name () <<"::_downcast" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 216fbd35b8d..305ba2f60e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -293,10 +293,10 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) } // TAO internals. - *os << "virtual void *_tao_obv_narrow (ptr_arith_t);" + *os << "virtual void *_tao_obv_narrow (ptrdiff_t);" << "\n#if defined (_MSC_VER)" << be_nl << "virtual void *" << node->flat_name () - << "_tao_obv_narrow (ptr_arith_t);" + << "_tao_obv_narrow (ptrdiff_t);" << "\n#endif /* _MSC_VER */" << be_nl; // Support for marshalling. diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 451e98be5d6..4960ac401c0 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -156,7 +156,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "return 0;" << be_uidt_nl << "}" << be_uidt_nl << be_nl << "return (" << node->local_name () << " *) " - << "v->_tao_obv_narrow ((ptr_arith_t) &_downcast);" << be_uidt_nl + << "v->_tao_obv_narrow ((ptrdiff_t) &_downcast);" << be_uidt_nl << "}" << be_nl << be_nl; // The _tao_obv_repository_id method @@ -172,13 +172,13 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "void *" << be_nl << "#if defined (_MSC_VER)" << be_nl << node->name () << "::" << node->flat_name () - << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "_tao_obv_narrow (ptrdiff_t type_id)" << be_nl << "#else" << be_nl << node->name () << "::" - << "_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "_tao_obv_narrow (ptrdiff_t type_id)" << be_nl << "#endif /* _MSC_VER */" << be_nl << "{" << be_idt_nl - << "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl + << "if (type_id == (ptrdiff_t) &_downcast)" << be_idt_nl << "{" << be_idt_nl << "return this;" << be_uidt_nl << "}" << be_uidt_nl << be_nl @@ -241,7 +241,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) *os << "#if defined (_MSC_VER)" << be_nl << "void *" << be_nl << node->name () - << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl + << "::_tao_obv_narrow (ptrdiff_t type_id)" << be_nl << "{" << be_idt_nl << "return this->" << node->flat_name () << "_tao_obv_narrow (type_id);" << be_uidt_nl diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index 07ed18f146f..b3da36787a7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -436,7 +436,7 @@ TAO_SSLIOP_Credentials::_unchecked_narrow (CORBA::Object_ptr obj ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_SSLIOP_Credentials::_tao_class_id ) ) @@ -453,15 +453,15 @@ TAO_SSLIOP_Credentials::_duplicate (TAO_SSLIOP_Credentials_ptr obj) } void * -TAO_SSLIOP_Credentials::_tao_QueryInterface (ptr_arith_t type) +TAO_SSLIOP_Credentials::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_SSLIOP_Credentials::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &::SecurityLevel2::Credentials::_tao_class_id)) retv = ACE_reinterpret_cast ( @@ -472,7 +472,7 @@ TAO_SSLIOP_Credentials::_tao_QueryInterface (ptr_arith_t type) this ) ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index 68f70b49f06..47cc0edc195 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -257,7 +257,7 @@ public: return (TAO_SSLIOP_Credentials_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); //@} protected: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp index c579340c5e4..4152880b78c 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp @@ -153,7 +153,7 @@ TAO_SSLIOP_Current::_unchecked_narrow ( ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_SSLIOP_Current::_tao_class_id ) ) @@ -170,15 +170,15 @@ TAO_SSLIOP_Current::_duplicate (TAO_SSLIOP_Current_ptr obj) } void * -TAO_SSLIOP_Current::_tao_QueryInterface (ptr_arith_t type) +TAO_SSLIOP_Current::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_SSLIOP_Current::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &::SSLIOP::Current::_tao_class_id)) retv = ACE_reinterpret_cast ( @@ -190,7 +190,7 @@ TAO_SSLIOP_Current::_tao_QueryInterface (ptr_arith_t type) ) ); else if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &::CORBA::Current::_tao_class_id)) retv = ACE_reinterpret_cast ( @@ -201,7 +201,7 @@ TAO_SSLIOP_Current::_tao_QueryInterface (ptr_arith_t type) this ) ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h index a3798369bac..dc9acc9eb02 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h @@ -131,7 +131,7 @@ public: return (TAO_SSLIOP_Current_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; //@} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp index 08c2f808c35..0c91979e396 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp @@ -112,7 +112,7 @@ TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (CORBA::Object_ptr obj ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_SSLIOP_ReceivedCredentials::_tao_class_id ) ) @@ -130,15 +130,15 @@ TAO_SSLIOP_ReceivedCredentials::_duplicate ( } void * -TAO_SSLIOP_ReceivedCredentials::_tao_QueryInterface (ptr_arith_t type) +TAO_SSLIOP_ReceivedCredentials::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_SSLIOP_ReceivedCredentials::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &::SecurityLevel2::Credentials::_tao_class_id)) retv = ACE_reinterpret_cast ( @@ -149,7 +149,7 @@ TAO_SSLIOP_ReceivedCredentials::_tao_QueryInterface (ptr_arith_t type) this ) ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h index 778a6ac28ae..fcc3a054b8e 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h @@ -110,7 +110,7 @@ public: return (TAO_SSLIOP_ReceivedCredentials_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); //@} }; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp index eff8dbf4820..54069f64e42 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp @@ -91,7 +91,7 @@ TAO_SSLIOP_TargetCredentials::_unchecked_narrow (CORBA::Object_ptr obj ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_SSLIOP_TargetCredentials::_tao_class_id ) ) @@ -109,15 +109,15 @@ TAO_SSLIOP_TargetCredentials::_duplicate ( } void * -TAO_SSLIOP_TargetCredentials::_tao_QueryInterface (ptr_arith_t type) +TAO_SSLIOP_TargetCredentials::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_SSLIOP_TargetCredentials::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &::SecurityLevel2::Credentials::_tao_class_id)) retv = ACE_reinterpret_cast ( @@ -128,7 +128,7 @@ TAO_SSLIOP_TargetCredentials::_tao_QueryInterface (ptr_arith_t type) this ) ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h index 7bf32d6c168..cf2f644228f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h @@ -100,7 +100,7 @@ public: return (TAO_SSLIOP_TargetCredentials_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); //@} }; diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp index f5f8d674bc3..7e8a95ebfa6 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp @@ -433,7 +433,7 @@ TAO_PrincipalAuthenticator::_unchecked_narrow ( ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_PrincipalAuthenticator::_tao_class_id ) ) @@ -449,15 +449,15 @@ TAO_PrincipalAuthenticator::_duplicate (TAO_PrincipalAuthenticator_ptr obj) } void * -TAO_PrincipalAuthenticator::_tao_QueryInterface (ptr_arith_t type) +TAO_PrincipalAuthenticator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_PrincipalAuthenticator::_tao_class_id)) retv = ACE_reinterpret_cast (void*, this); else if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &::SecurityLevel2::PrincipalAuthenticator::_tao_class_id)) retv = ACE_reinterpret_cast ( @@ -468,7 +468,7 @@ TAO_PrincipalAuthenticator::_tao_QueryInterface (ptr_arith_t type) this ) ); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id)) + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_tao_class_id)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h index 36601d95469..6f357e16bee 100644 --- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h +++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h @@ -139,7 +139,7 @@ public: return (TAO_PrincipalAuthenticator_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; //@} diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp index 443f8b2bbfe..ac6ee589572 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp @@ -199,7 +199,7 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow ( BidirectionalPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &BidirectionalPolicy::_tao_class_id ) ) @@ -217,19 +217,19 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj) return obj; } -void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptr_arith_t type) +void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::BiDirPolicy, BidirectionalPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -243,7 +243,7 @@ void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h index 18d412c58f7..6c211b42003 100644 --- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h +++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h @@ -186,7 +186,7 @@ TAO_NAMESPACE BiDirPolicy // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 0356c307b04..46b9a44b2a9 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -195,7 +195,7 @@ TAO_DynAny_i::_narrow (CORBA::Object_ptr obj TAO_DynAny_i*, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_DynAny_i::_narrow ) ) @@ -203,10 +203,10 @@ TAO_DynAny_i::_narrow (CORBA::Object_ptr obj } void* -TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type) +TAO_DynAny_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_DynAny_i::_narrow); if (type == mytype) { diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index 5039f8d689a..3e1a1e13bdd 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -64,7 +64,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); // = DynAny common functions not implemented in class TAO_DynCommon. diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp index 7064c1f291a..0dccbf479e2 100644 --- a/TAO/tao/DynamicAny/DynArray_i.cpp +++ b/TAO/tao/DynamicAny/DynArray_i.cpp @@ -199,7 +199,7 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr obj TAO_DynArray_i*, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_DynArray_i::_narrow ) ) @@ -207,10 +207,10 @@ TAO_DynArray_i::_narrow (CORBA::Object_ptr obj } void* -TAO_DynArray_i::_tao_QueryInterface (ptr_arith_t type) +TAO_DynArray_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_DynArray_i::_narrow); if (type == mytype) { diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index f700af3887a..b81708ad2cc 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -65,7 +65,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); // = Functions specific to DynArray. diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index ebf24ece023..0d556cd1e62 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -91,7 +91,7 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj TAO_DynEnum_i*, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_DynEnum_i::_narrow ) ) @@ -99,10 +99,10 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj } void* -TAO_DynEnum_i::_tao_QueryInterface (ptr_arith_t type) +TAO_DynEnum_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_DynEnum_i::_narrow); if (type == mytype) { diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h index b852d1851c6..1c83565e57b 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.h +++ b/TAO/tao/DynamicAny/DynEnum_i.h @@ -65,7 +65,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); // = Functions specific to DynEnum. diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp index e8c3efbf79f..8d1ff58542d 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.cpp +++ b/TAO/tao/DynamicAny/DynSequence_i.cpp @@ -140,7 +140,7 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr obj TAO_DynSequence_i*, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_DynSequence_i::_narrow ) ) @@ -148,10 +148,10 @@ TAO_DynSequence_i::_narrow (CORBA::Object_ptr obj } void* -TAO_DynSequence_i::_tao_QueryInterface (ptr_arith_t type) +TAO_DynSequence_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_DynSequence_i::_narrow); if (type == mytype) { diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h index 4f35c40e8ec..ba8046d2544 100644 --- a/TAO/tao/DynamicAny/DynSequence_i.h +++ b/TAO/tao/DynamicAny/DynSequence_i.h @@ -65,7 +65,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); // = Functions specific to DynSequence. diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp index c74c7b6fe7c..a28349c6e7e 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.cpp +++ b/TAO/tao/DynamicAny/DynStruct_i.cpp @@ -194,7 +194,7 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr obj TAO_DynStruct_i*, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_DynStruct_i::_narrow ) ) @@ -202,10 +202,10 @@ TAO_DynStruct_i::_narrow (CORBA::Object_ptr obj } void* -TAO_DynStruct_i::_tao_QueryInterface (ptr_arith_t type) +TAO_DynStruct_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_DynStruct_i::_narrow); if (type == mytype) { diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h index 3cf051f105c..6a786b65ced 100644 --- a/TAO/tao/DynamicAny/DynStruct_i.h +++ b/TAO/tao/DynamicAny/DynStruct_i.h @@ -65,7 +65,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); // = Functions specific to DynStruct. diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp index ff3b852fa7e..520951cf1bb 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.cpp +++ b/TAO/tao/DynamicAny/DynUnion_i.cpp @@ -115,7 +115,7 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr obj TAO_DynUnion_i*, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_DynUnion_i::_narrow ) ) @@ -123,10 +123,10 @@ TAO_DynUnion_i::_narrow (CORBA::Object_ptr obj } void* -TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type) +TAO_DynUnion_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_DynUnion_i::_narrow); if (type == mytype) { diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h index c5038b1bf9a..a23ce04e050 100644 --- a/TAO/tao/DynamicAny/DynUnion_i.h +++ b/TAO/tao/DynamicAny/DynUnion_i.h @@ -61,7 +61,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); // = Functions specific to DynUnion. diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index c6d0fa9768c..cc5f35ce5b7 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -164,7 +164,7 @@ DynamicAny::DynAny::_unchecked_narrow ( DynAny_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynAny::_tao_class_id ) ) @@ -182,19 +182,19 @@ DynamicAny::DynAny::_duplicate (DynAny_ptr obj) return obj; } -void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynAny::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -509,7 +509,7 @@ DynamicAny::DynFixed::_unchecked_narrow ( DynFixed_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynFixed::_tao_class_id ) ) @@ -527,19 +527,19 @@ DynamicAny::DynFixed::_duplicate (DynFixed_ptr obj) return obj; } -void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynFixed::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynFixed)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -553,7 +553,7 @@ void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -698,7 +698,7 @@ DynamicAny::DynEnum::_unchecked_narrow ( DynEnum_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynEnum::_tao_class_id ) ) @@ -716,19 +716,19 @@ DynamicAny::DynEnum::_duplicate (DynEnum_ptr obj) return obj; } -void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynEnum::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynEnum)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -742,7 +742,7 @@ void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1189,7 +1189,7 @@ DynamicAny::DynStruct::_unchecked_narrow ( DynStruct_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynStruct::_tao_class_id ) ) @@ -1207,19 +1207,19 @@ DynamicAny::DynStruct::_duplicate (DynStruct_ptr obj) return obj; } -void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynStruct::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynStruct)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -1233,7 +1233,7 @@ void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1378,7 +1378,7 @@ DynamicAny::DynUnion::_unchecked_narrow ( DynUnion_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynUnion::_tao_class_id ) ) @@ -1396,19 +1396,19 @@ DynamicAny::DynUnion::_duplicate (DynUnion_ptr obj) return obj; } -void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynUnion::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynUnion)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -1422,7 +1422,7 @@ void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1821,7 +1821,7 @@ DynamicAny::DynSequence::_unchecked_narrow ( DynSequence_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynSequence::_tao_class_id ) ) @@ -1839,19 +1839,19 @@ DynamicAny::DynSequence::_duplicate (DynSequence_ptr obj) return obj; } -void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynSequence::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynSequence)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -1865,7 +1865,7 @@ void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2010,7 +2010,7 @@ DynamicAny::DynArray::_unchecked_narrow ( DynArray_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynArray::_tao_class_id ) ) @@ -2028,19 +2028,19 @@ DynamicAny::DynArray::_duplicate (DynArray_ptr obj) return obj; } -void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynArray::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynArray)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -2054,7 +2054,7 @@ void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2199,7 +2199,7 @@ DynamicAny::DynValue::_unchecked_narrow ( DynValue_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynValue::_tao_class_id ) ) @@ -2217,19 +2217,19 @@ DynamicAny::DynValue::_duplicate (DynValue_ptr obj) return obj; } -void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynValue::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynValue)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAny)::_tao_class_id) ) { @@ -2243,7 +2243,7 @@ void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2388,7 +2388,7 @@ DynamicAny::DynAnyFactory::_unchecked_narrow ( DynAnyFactory_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &DynAnyFactory::_tao_class_id ) ) @@ -2406,19 +2406,19 @@ DynamicAny::DynAnyFactory::_duplicate (DynAnyFactory_ptr obj) return obj; } -void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type) +void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::DynamicAny, DynAnyFactory)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h index ad53e9f207b..aef3b1068ba 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.h +++ b/TAO/tao/DynamicAny/DynamicAnyC.h @@ -863,7 +863,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -985,7 +985,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1128,7 +1128,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1456,7 +1456,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1652,7 +1652,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1922,7 +1922,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2067,7 +2067,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2236,7 +2236,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2398,7 +2398,7 @@ TAO_NAMESPACE DynamicAny // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 278ea4f19cf..04527692ff5 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -1,4 +1,4 @@ -// This may look like C, but it's really -*- C++ -*- +// -*- C++ -*- //============================================================================= /** @@ -8,14 +8,14 @@ * * This file defines way in which CORBA exceptions are reported. * - * * @author Copyright 1994-1995 by Sun Microsystems Inc. - * @author DOC Group at Wash U, UCI and Vanderbilt U. + * @author DOC Group at Vanderbilt U., Wash U, and UCI */ //============================================================================= #ifndef TAO_EXCEPTION_H #define TAO_EXCEPTION_H + #include "ace/pre.h" #include "tao/corbafwd.h" @@ -421,4 +421,5 @@ public: #endif /* __ACE_INLINE__ */ #include "ace/post.h" + #endif /* TAO_EXCEPTION_H */ diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp index 7866b6ebf56..a4828a59fe6 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.cpp +++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp @@ -1206,7 +1206,7 @@ CORBA::IRObject::_unchecked_narrow ( IRObject_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &IRObject::_tao_class_id ) ) @@ -1252,19 +1252,19 @@ CORBA::IRObject::_is_a ( } } -void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::IRObject::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -4923,7 +4923,7 @@ CORBA::Contained::_unchecked_narrow ( Contained_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Contained::_tao_class_id ) ) @@ -4973,19 +4973,19 @@ CORBA::Contained::_is_a ( } } -void *CORBA::Contained::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::Contained::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, Contained)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id) ) { @@ -4999,7 +4999,7 @@ void *CORBA::Contained::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -16481,7 +16481,7 @@ CORBA::Container::_unchecked_narrow ( Container_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Container::_tao_class_id ) ) @@ -16531,19 +16531,19 @@ CORBA::Container::_is_a ( } } -void *CORBA::Container::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::Container::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, Container)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id) ) { @@ -16557,7 +16557,7 @@ void *CORBA::Container::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -18505,7 +18505,7 @@ CORBA::IDLType::_unchecked_narrow ( IDLType_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &IDLType::_tao_class_id ) ) @@ -18555,19 +18555,19 @@ CORBA::IDLType::_is_a ( } } -void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::IDLType::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IDLType)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id) ) { @@ -18581,7 +18581,7 @@ void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -18968,7 +18968,7 @@ CORBA::TypedefDef::_unchecked_narrow ( TypedefDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TypedefDef::_tao_class_id ) ) @@ -19026,19 +19026,19 @@ CORBA::TypedefDef::_is_a ( } } -void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::TypedefDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, TypedefDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, Contained)::_tao_class_id) ) { @@ -19052,7 +19052,7 @@ void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IDLType)::_tao_class_id) ) { @@ -19066,7 +19066,7 @@ void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, IRObject)::_tao_class_id) ) { @@ -19080,7 +19080,7 @@ void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h index af7dc30d248..1736ecedf2b 100644 --- a/TAO/tao/IFR_Client/IFR_BaseC.h +++ b/TAO/tao/IFR_Client/IFR_BaseC.h @@ -268,7 +268,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -814,7 +814,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3519,7 +3519,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4283,7 +4283,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4554,7 +4554,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp index 6986985b6cd..76a8440c543 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.cpp +++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp @@ -3032,7 +3032,7 @@ CORBA::Repository::_unchecked_narrow ( Repository_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Repository::_tao_class_id ) ) @@ -3086,19 +3086,19 @@ CORBA::Repository::_is_a ( } } -void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::Repository::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, Repository)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -3112,7 +3112,7 @@ void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -3126,7 +3126,7 @@ void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3733,7 +3733,7 @@ CORBA::ModuleDef::_unchecked_narrow ( ModuleDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ModuleDef::_tao_class_id ) ) @@ -3791,19 +3791,19 @@ CORBA::ModuleDef::_is_a ( } } -void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ModuleDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ModuleDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -3817,7 +3817,7 @@ void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -3831,7 +3831,7 @@ void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -3845,7 +3845,7 @@ void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -5808,7 +5808,7 @@ CORBA::ConstantDef::_unchecked_narrow ( ConstantDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ConstantDef::_tao_class_id ) ) @@ -5862,19 +5862,19 @@ CORBA::ConstantDef::_is_a ( } } -void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ConstantDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ConstantDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -5888,7 +5888,7 @@ void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -5902,7 +5902,7 @@ void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -7156,7 +7156,7 @@ CORBA::StructDef::_unchecked_narrow ( StructDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &StructDef::_tao_class_id ) ) @@ -7222,19 +7222,19 @@ CORBA::StructDef::_is_a ( } } -void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::StructDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, StructDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::TypedefDef::_tao_class_id) ) { @@ -7248,7 +7248,7 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -7262,7 +7262,7 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -7276,7 +7276,7 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -7290,7 +7290,7 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -7304,7 +7304,7 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -9168,7 +9168,7 @@ CORBA::UnionDef::_unchecked_narrow ( UnionDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &UnionDef::_tao_class_id ) ) @@ -9234,19 +9234,19 @@ CORBA::UnionDef::_is_a ( } } -void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::UnionDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, UnionDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::TypedefDef::_tao_class_id) ) { @@ -9260,7 +9260,7 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -9274,7 +9274,7 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -9288,7 +9288,7 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -9302,7 +9302,7 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -9316,7 +9316,7 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -10399,7 +10399,7 @@ CORBA::EnumDef::_unchecked_narrow ( EnumDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &EnumDef::_tao_class_id ) ) @@ -10461,19 +10461,19 @@ CORBA::EnumDef::_is_a ( } } -void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::EnumDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, EnumDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::TypedefDef::_tao_class_id) ) { @@ -10487,7 +10487,7 @@ void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -10501,7 +10501,7 @@ void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -10515,7 +10515,7 @@ void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -10529,7 +10529,7 @@ void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -11519,7 +11519,7 @@ CORBA::AliasDef::_unchecked_narrow ( AliasDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &AliasDef::_tao_class_id ) ) @@ -11581,19 +11581,19 @@ CORBA::AliasDef::_is_a ( } } -void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::AliasDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, AliasDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::TypedefDef::_tao_class_id) ) { @@ -11607,7 +11607,7 @@ void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -11621,7 +11621,7 @@ void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -11635,7 +11635,7 @@ void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -11649,7 +11649,7 @@ void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -12066,7 +12066,7 @@ CORBA::NativeDef::_unchecked_narrow ( NativeDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &NativeDef::_tao_class_id ) ) @@ -12128,19 +12128,19 @@ CORBA::NativeDef::_is_a ( } } -void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::NativeDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, NativeDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::TypedefDef::_tao_class_id) ) { @@ -12154,7 +12154,7 @@ void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -12168,7 +12168,7 @@ void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -12182,7 +12182,7 @@ void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -12196,7 +12196,7 @@ void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -12846,7 +12846,7 @@ CORBA::PrimitiveDef::_unchecked_narrow ( PrimitiveDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &PrimitiveDef::_tao_class_id ) ) @@ -12900,19 +12900,19 @@ CORBA::PrimitiveDef::_is_a ( } } -void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::PrimitiveDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, PrimitiveDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -12926,7 +12926,7 @@ void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -12940,7 +12940,7 @@ void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -13902,7 +13902,7 @@ CORBA::StringDef::_unchecked_narrow ( StringDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &StringDef::_tao_class_id ) ) @@ -13956,19 +13956,19 @@ CORBA::StringDef::_is_a ( } } -void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::StringDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, StringDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -13982,7 +13982,7 @@ void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -13996,7 +13996,7 @@ void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -14986,7 +14986,7 @@ CORBA::WstringDef::_unchecked_narrow ( WstringDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &WstringDef::_tao_class_id ) ) @@ -15040,19 +15040,19 @@ CORBA::WstringDef::_is_a ( } } -void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::WstringDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, WstringDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -15066,7 +15066,7 @@ void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -15080,7 +15080,7 @@ void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -16937,7 +16937,7 @@ CORBA::SequenceDef::_unchecked_narrow ( SequenceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &SequenceDef::_tao_class_id ) ) @@ -16991,19 +16991,19 @@ CORBA::SequenceDef::_is_a ( } } -void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::SequenceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, SequenceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -17017,7 +17017,7 @@ void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -17031,7 +17031,7 @@ void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -18974,7 +18974,7 @@ CORBA::ArrayDef::_unchecked_narrow ( ArrayDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ArrayDef::_tao_class_id ) ) @@ -19028,19 +19028,19 @@ CORBA::ArrayDef::_is_a ( } } -void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ArrayDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ArrayDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -19054,7 +19054,7 @@ void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -19068,7 +19068,7 @@ void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -20444,7 +20444,7 @@ CORBA::ExceptionDef::_unchecked_narrow ( ExceptionDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ExceptionDef::_tao_class_id ) ) @@ -20502,19 +20502,19 @@ CORBA::ExceptionDef::_is_a ( } } -void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ExceptionDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ExceptionDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -20528,7 +20528,7 @@ void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -20542,7 +20542,7 @@ void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -20556,7 +20556,7 @@ void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -22690,7 +22690,7 @@ CORBA::AttributeDef::_unchecked_narrow ( AttributeDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &AttributeDef::_tao_class_id ) ) @@ -22744,19 +22744,19 @@ CORBA::AttributeDef::_is_a ( } } -void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::AttributeDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, AttributeDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -22770,7 +22770,7 @@ void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -22784,7 +22784,7 @@ void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -25229,7 +25229,7 @@ CORBA::ExtAttributeDef::_unchecked_narrow ( ExtAttributeDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ExtAttributeDef::_tao_class_id ) ) @@ -25287,19 +25287,19 @@ CORBA::ExtAttributeDef::_is_a ( } } -void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ExtAttributeDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, AttributeDef)::_tao_class_id) ) { @@ -25313,7 +25313,7 @@ void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -25327,7 +25327,7 @@ void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -25341,7 +25341,7 @@ void *CORBA::ExtAttributeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -29715,7 +29715,7 @@ CORBA::OperationDef::_unchecked_narrow ( OperationDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &OperationDef::_tao_class_id ) ) @@ -29769,19 +29769,19 @@ CORBA::OperationDef::_is_a ( } } -void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::OperationDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, OperationDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -29795,7 +29795,7 @@ void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -29809,7 +29809,7 @@ void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -34182,7 +34182,7 @@ CORBA::InterfaceDef::_unchecked_narrow ( InterfaceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &InterfaceDef::_tao_class_id ) ) @@ -34244,19 +34244,19 @@ CORBA::InterfaceDef::_is_a ( } } -void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::InterfaceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -34270,7 +34270,7 @@ void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -34284,7 +34284,7 @@ void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -34298,7 +34298,7 @@ void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -34312,7 +34312,7 @@ void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -36408,7 +36408,7 @@ CORBA::InterfaceAttrExtension::_unchecked_narrow ( InterfaceAttrExtension_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &InterfaceAttrExtension::_tao_class_id ) ) @@ -36454,19 +36454,19 @@ CORBA::InterfaceAttrExtension::_is_a ( } } -void *CORBA::InterfaceAttrExtension::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::InterfaceAttrExtension::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -37590,7 +37590,7 @@ CORBA::ExtInterfaceDef::_unchecked_narrow ( ExtInterfaceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ExtInterfaceDef::_tao_class_id ) ) @@ -37660,19 +37660,19 @@ CORBA::ExtInterfaceDef::_is_a ( } } -void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ExtInterfaceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id) ) { @@ -37686,7 +37686,7 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id) ) { @@ -37700,7 +37700,7 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -37714,7 +37714,7 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -37728,7 +37728,7 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -37742,7 +37742,7 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -37756,7 +37756,7 @@ void *CORBA::ExtInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -38118,7 +38118,7 @@ CORBA::AbstractInterfaceDef::_unchecked_narrow ( AbstractInterfaceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &AbstractInterfaceDef::_tao_class_id ) ) @@ -38184,19 +38184,19 @@ CORBA::AbstractInterfaceDef::_is_a ( } } -void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, AbstractInterfaceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id) ) { @@ -38210,7 +38210,7 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -38224,7 +38224,7 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -38238,7 +38238,7 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -38252,7 +38252,7 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -38266,7 +38266,7 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -38632,7 +38632,7 @@ CORBA::ExtAbstractInterfaceDef::_unchecked_narrow ( ExtAbstractInterfaceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ExtAbstractInterfaceDef::_tao_class_id ) ) @@ -38706,19 +38706,19 @@ CORBA::ExtAbstractInterfaceDef::_is_a ( } } -void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ExtAbstractInterfaceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, AbstractInterfaceDef)::_tao_class_id) ) { @@ -38732,7 +38732,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id) ) { @@ -38746,7 +38746,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id) ) { @@ -38760,7 +38760,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -38774,7 +38774,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -38788,7 +38788,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -38802,7 +38802,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -38816,7 +38816,7 @@ void *CORBA::ExtAbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -39182,7 +39182,7 @@ CORBA::LocalInterfaceDef::_unchecked_narrow ( LocalInterfaceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &LocalInterfaceDef::_tao_class_id ) ) @@ -39248,19 +39248,19 @@ CORBA::LocalInterfaceDef::_is_a ( } } -void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, LocalInterfaceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id) ) { @@ -39274,7 +39274,7 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -39288,7 +39288,7 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -39302,7 +39302,7 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -39316,7 +39316,7 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -39330,7 +39330,7 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -39694,7 +39694,7 @@ CORBA::ExtLocalInterfaceDef::_unchecked_narrow ( ExtLocalInterfaceDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ExtLocalInterfaceDef::_tao_class_id ) ) @@ -39768,19 +39768,19 @@ CORBA::ExtLocalInterfaceDef::_is_a ( } } -void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ExtLocalInterfaceDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, LocalInterfaceDef)::_tao_class_id) ) { @@ -39794,7 +39794,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceAttrExtension)::_tao_class_id) ) { @@ -39808,7 +39808,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_tao_class_id) ) { @@ -39822,7 +39822,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -39836,7 +39836,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -39850,7 +39850,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -39864,7 +39864,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -39878,7 +39878,7 @@ void *CORBA::ExtLocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h index 8c06ad08adf..625cd11eb8f 100644 --- a/TAO/tao/IFR_Client/IFR_BasicC.h +++ b/TAO/tao/IFR_Client/IFR_BasicC.h @@ -569,7 +569,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1016,7 +1016,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1355,7 +1355,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1778,7 +1778,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2127,7 +2127,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2512,7 +2512,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2827,7 +2827,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3121,7 +3121,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3333,7 +3333,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3578,7 +3578,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3847,7 +3847,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4147,7 +4147,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4515,7 +4515,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4909,7 +4909,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -5359,7 +5359,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -5853,7 +5853,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -6499,7 +6499,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -7369,7 +7369,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -7889,7 +7889,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -8195,7 +8195,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -8445,7 +8445,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -8694,7 +8694,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -8944,7 +8944,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -9193,7 +9193,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp index dc38cbcaa0e..880f2fa003b 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp @@ -340,7 +340,7 @@ CORBA::ComponentIR::EventDef::_unchecked_narrow ( EventDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &EventDef::_tao_class_id ) ) @@ -410,19 +410,19 @@ CORBA::ComponentIR::EventDef::_is_a ( } } -void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::ExtValueDef::_tao_class_id) ) { @@ -436,7 +436,7 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::ValueDef::_tao_class_id) ) { @@ -450,7 +450,7 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -464,7 +464,7 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -478,7 +478,7 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -492,7 +492,7 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -506,7 +506,7 @@ void *CORBA::ComponentIR::EventDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2025,7 +2025,7 @@ CORBA::ComponentIR::Container::_unchecked_narrow ( Container_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Container::_tao_class_id ) ) @@ -2071,19 +2071,19 @@ CORBA::ComponentIR::Container::_is_a ( } } -void *CORBA::ComponentIR::Container::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::Container::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2576,7 +2576,7 @@ CORBA::ComponentIR::ModuleDef::_unchecked_narrow ( ModuleDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ModuleDef::_tao_class_id ) ) @@ -2642,19 +2642,19 @@ CORBA::ComponentIR::ModuleDef::_is_a ( } } -void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, ModuleDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::ModuleDef::_tao_class_id) ) { @@ -2668,7 +2668,7 @@ void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id) ) { @@ -2682,7 +2682,7 @@ void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -2696,7 +2696,7 @@ void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -2710,7 +2710,7 @@ void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -2724,7 +2724,7 @@ void *CORBA::ComponentIR::ModuleDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3089,7 +3089,7 @@ CORBA::ComponentIR::Repository::_unchecked_narrow ( Repository_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Repository::_tao_class_id ) ) @@ -3151,19 +3151,19 @@ CORBA::ComponentIR::Repository::_is_a ( } } -void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, Repository)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Repository::_tao_class_id) ) { @@ -3177,7 +3177,7 @@ void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, Container)::_tao_class_id) ) { @@ -3191,7 +3191,7 @@ void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -3205,7 +3205,7 @@ void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -3219,7 +3219,7 @@ void *CORBA::ComponentIR::Repository::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -4158,7 +4158,7 @@ CORBA::ComponentIR::ProvidesDef::_unchecked_narrow ( ProvidesDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ProvidesDef::_tao_class_id ) ) @@ -4212,19 +4212,19 @@ CORBA::ComponentIR::ProvidesDef::_is_a ( } } -void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, ProvidesDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -4238,7 +4238,7 @@ void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -4252,7 +4252,7 @@ void *CORBA::ComponentIR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -5993,7 +5993,7 @@ CORBA::ComponentIR::UsesDef::_unchecked_narrow ( UsesDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &UsesDef::_tao_class_id ) ) @@ -6047,19 +6047,19 @@ CORBA::ComponentIR::UsesDef::_is_a ( } } -void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, UsesDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -6073,7 +6073,7 @@ void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -6087,7 +6087,7 @@ void *CORBA::ComponentIR::UsesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -7630,7 +7630,7 @@ CORBA::ComponentIR::EventPortDef::_unchecked_narrow ( EventPortDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &EventPortDef::_tao_class_id ) ) @@ -7684,19 +7684,19 @@ CORBA::ComponentIR::EventPortDef::_is_a ( } } -void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -7710,7 +7710,7 @@ void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -7724,7 +7724,7 @@ void *CORBA::ComponentIR::EventPortDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -8348,7 +8348,7 @@ CORBA::ComponentIR::EmitsDef::_unchecked_narrow ( EmitsDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &EmitsDef::_tao_class_id ) ) @@ -8406,19 +8406,19 @@ CORBA::ComponentIR::EmitsDef::_is_a ( } } -void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, EmitsDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id) ) { @@ -8432,7 +8432,7 @@ void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -8446,7 +8446,7 @@ void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -8460,7 +8460,7 @@ void *CORBA::ComponentIR::EmitsDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -8824,7 +8824,7 @@ CORBA::ComponentIR::PublishesDef::_unchecked_narrow ( PublishesDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &PublishesDef::_tao_class_id ) ) @@ -8882,19 +8882,19 @@ CORBA::ComponentIR::PublishesDef::_is_a ( } } -void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, PublishesDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id) ) { @@ -8908,7 +8908,7 @@ void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -8922,7 +8922,7 @@ void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -8936,7 +8936,7 @@ void *CORBA::ComponentIR::PublishesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -9302,7 +9302,7 @@ CORBA::ComponentIR::ConsumesDef::_unchecked_narrow ( ConsumesDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ConsumesDef::_tao_class_id ) ) @@ -9360,19 +9360,19 @@ CORBA::ComponentIR::ConsumesDef::_is_a ( } } -void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, ConsumesDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, EventPortDef)::_tao_class_id) ) { @@ -9386,7 +9386,7 @@ void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -9400,7 +9400,7 @@ void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -9414,7 +9414,7 @@ void *CORBA::ComponentIR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -12689,7 +12689,7 @@ CORBA::ComponentIR::ComponentDef::_unchecked_narrow ( ComponentDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ComponentDef::_tao_class_id ) ) @@ -12763,19 +12763,19 @@ CORBA::ComponentIR::ComponentDef::_is_a ( } } -void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, ComponentDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::ExtInterfaceDef::_tao_class_id) ) { @@ -12789,7 +12789,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::InterfaceDef::_tao_class_id) ) { @@ -12803,7 +12803,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::InterfaceAttrExtension::_tao_class_id) ) { @@ -12817,7 +12817,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -12831,7 +12831,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -12845,7 +12845,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -12859,7 +12859,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -12873,7 +12873,7 @@ void *CORBA::ComponentIR::ComponentDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -14990,7 +14990,7 @@ CORBA::ComponentIR::FactoryDef::_unchecked_narrow ( FactoryDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &FactoryDef::_tao_class_id ) ) @@ -15048,19 +15048,19 @@ CORBA::ComponentIR::FactoryDef::_is_a ( } } -void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, FactoryDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::OperationDef::_tao_class_id) ) { @@ -15074,7 +15074,7 @@ void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -15088,7 +15088,7 @@ void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -15102,7 +15102,7 @@ void *CORBA::ComponentIR::FactoryDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -15467,7 +15467,7 @@ CORBA::ComponentIR::FinderDef::_unchecked_narrow ( FinderDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &FinderDef::_tao_class_id ) ) @@ -15525,19 +15525,19 @@ CORBA::ComponentIR::FinderDef::_is_a ( } } -void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, FinderDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::OperationDef::_tao_class_id) ) { @@ -15551,7 +15551,7 @@ void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -15565,7 +15565,7 @@ void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -15579,7 +15579,7 @@ void *CORBA::ComponentIR::FinderDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -18965,7 +18965,7 @@ CORBA::ComponentIR::HomeDef::_unchecked_narrow ( HomeDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &HomeDef::_tao_class_id ) ) @@ -19039,19 +19039,19 @@ CORBA::ComponentIR::HomeDef::_is_a ( } } -void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA::ComponentIR, HomeDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::ExtInterfaceDef::_tao_class_id) ) { @@ -19065,7 +19065,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::InterfaceDef::_tao_class_id) ) { @@ -19079,7 +19079,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::InterfaceAttrExtension::_tao_class_id) ) { @@ -19093,7 +19093,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -19107,7 +19107,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -19121,7 +19121,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -19135,7 +19135,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -19149,7 +19149,7 @@ void *CORBA::ComponentIR::HomeDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h index a457c8968e9..23d106a7f1a 100644 --- a/TAO/tao/IFR_Client/IFR_ComponentsC.h +++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h @@ -264,7 +264,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -564,7 +564,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -922,7 +922,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1173,7 +1173,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1444,7 +1444,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1818,7 +1818,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2229,7 +2229,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2585,7 +2585,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2833,7 +2833,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3081,7 +3081,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3396,7 +3396,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4093,7 +4093,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4341,7 +4341,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -4657,7 +4657,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp index add2bf2f487..39744d7ef6f 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp @@ -1486,7 +1486,7 @@ CORBA::FixedDef::_unchecked_narrow ( FixedDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &FixedDef::_tao_class_id ) ) @@ -1540,19 +1540,19 @@ CORBA::FixedDef::_is_a ( } } -void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::FixedDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, FixedDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -1566,7 +1566,7 @@ void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -1580,7 +1580,7 @@ void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3973,7 +3973,7 @@ CORBA::ValueMemberDef::_unchecked_narrow ( ValueMemberDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ValueMemberDef::_tao_class_id ) ) @@ -4027,19 +4027,19 @@ CORBA::ValueMemberDef::_is_a ( } } -void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ValueMemberDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ValueMemberDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -4053,7 +4053,7 @@ void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -4067,7 +4067,7 @@ void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -10334,7 +10334,7 @@ CORBA::ValueDef::_unchecked_narrow ( ValueDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ValueDef::_tao_class_id ) ) @@ -10396,19 +10396,19 @@ CORBA::ValueDef::_is_a ( } } -void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ValueDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ValueDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -10422,7 +10422,7 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -10436,7 +10436,7 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -10450,7 +10450,7 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -10464,7 +10464,7 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -13812,7 +13812,7 @@ CORBA::ExtValueDef::_unchecked_narrow ( ExtValueDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ExtValueDef::_tao_class_id ) ) @@ -13878,19 +13878,19 @@ CORBA::ExtValueDef::_is_a ( } } -void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ExtValueDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ExtValueDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ValueDef)::_tao_class_id) ) { @@ -13904,7 +13904,7 @@ void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Container::_tao_class_id) ) { @@ -13918,7 +13918,7 @@ void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -13932,7 +13932,7 @@ void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -13946,7 +13946,7 @@ void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -13960,7 +13960,7 @@ void *CORBA::ExtValueDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -15968,7 +15968,7 @@ CORBA::ValueBoxDef::_unchecked_narrow ( ValueBoxDef_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ValueBoxDef::_tao_class_id ) ) @@ -16030,19 +16030,19 @@ CORBA::ValueBoxDef::_is_a ( } } -void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::ValueBoxDef::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, ValueBoxDef)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::TypedefDef::_tao_class_id) ) { @@ -16056,7 +16056,7 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Contained::_tao_class_id) ) { @@ -16070,7 +16070,7 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IDLType::_tao_class_id) ) { @@ -16084,7 +16084,7 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::IRObject::_tao_class_id) ) { @@ -16098,7 +16098,7 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h index 63d5472c76a..3042f4c9386 100644 --- a/TAO/tao/IFR_Client/IFR_ExtendedC.h +++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h @@ -208,7 +208,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -693,7 +693,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1321,7 +1321,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2182,7 +2182,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2555,7 +2555,7 @@ TAO_NAMESPACE CORBA ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index 88113656e27..46af41709ad 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -887,7 +887,7 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow ( TAO_IOR_Property_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_IOR_Property::_tao_class_id ) ) @@ -905,19 +905,19 @@ TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj) return obj; } -void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type) +void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Property)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1110,7 +1110,7 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow ( TAO_IOR_Manipulation_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_IOR_Manipulation::_tao_class_id ) ) @@ -1128,19 +1128,19 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj) return obj; } -void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type) +void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h index da743c0d3d4..acdb669cec5 100644 --- a/TAO/tao/IORManipulation/IORC.h +++ b/TAO/tao/IORManipulation/IORC.h @@ -442,7 +442,7 @@ TAO_NAMESPACE TAO_IOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -726,7 +726,7 @@ TAO_NAMESPACE TAO_IOP // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index 10d75a0b896..b7baa599fcc 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -348,7 +348,7 @@ IORTable::Table::_unchecked_narrow ( Table_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Table::_tao_class_id ) ) @@ -366,19 +366,19 @@ IORTable::Table::_duplicate (Table_ptr obj) return obj; } -void *IORTable::Table::_tao_QueryInterface (ptr_arith_t type) +void *IORTable::Table::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::IORTable, Table)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -523,7 +523,7 @@ IORTable::Locator::_unchecked_narrow ( Locator_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Locator::_tao_class_id ) ) @@ -541,19 +541,19 @@ IORTable::Locator::_duplicate (Locator_ptr obj) return obj; } -void *IORTable::Locator::_tao_QueryInterface (ptr_arith_t type) +void *IORTable::Locator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::IORTable, Locator)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h index fff8e045caa..3e0230d08e8 100644 --- a/TAO/tao/IORTable/IORTableC.h +++ b/TAO/tao/IORTable/IORTableC.h @@ -320,7 +320,7 @@ TAO_NAMESPACE IORTable // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -385,7 +385,7 @@ TAO_NAMESPACE IORTable // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 2b9eca3c149..a9fd63a35be 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -190,7 +190,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v) return 0; } - return (ExceptionHolder *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); + return (ExceptionHolder *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); } const char * @@ -201,12 +201,12 @@ Messaging::ExceptionHolder::_tao_obv_repository_id (void) const void * #if defined (_MSC_VER) -Messaging::ExceptionHolder::Messaging_ExceptionHolder_tao_obv_narrow (ptr_arith_t type_id) +Messaging::ExceptionHolder::Messaging_ExceptionHolder_tao_obv_narrow (ptrdiff_t type_id) #else -Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id) +Messaging::ExceptionHolder::_tao_obv_narrow (ptrdiff_t type_id) #endif /* _MSC_VER */ { - if (type_id == (ptr_arith_t) &_downcast) + if (type_id == (ptrdiff_t) &_downcast) { return this; } @@ -218,7 +218,7 @@ Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id) #if defined (_MSC_VER) void * -Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id) +Messaging::ExceptionHolder::_tao_obv_narrow (ptrdiff_t type_id) { return this->Messaging_ExceptionHolder_tao_obv_narrow (type_id); } @@ -591,7 +591,7 @@ Messaging::ReplyHandler::_unchecked_narrow ( ReplyHandler_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ReplyHandler::_tao_class_id ) ) @@ -637,19 +637,19 @@ Messaging::ReplyHandler::_is_a ( } } -void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::ReplyHandler::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, ReplyHandler)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -942,7 +942,7 @@ operator<< ( Messaging::ExceptionHolder *, _tao_valuetype ), - (ptr_arith_t) &Messaging::ExceptionHolder::_downcast + (ptrdiff_t) &Messaging::ExceptionHolder::_downcast ); } diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index 1c5754c3651..20d1e9a6595 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -145,9 +145,9 @@ TAO_NAMESPACE Messaging ExceptionHolder (void); virtual ~ExceptionHolder (void); - virtual void *_tao_obv_narrow (ptr_arith_t); + virtual void *_tao_obv_narrow (ptrdiff_t); #if defined (_MSC_VER) - virtual void *Messaging_ExceptionHolder_tao_obv_narrow (ptr_arith_t); + virtual void *Messaging_ExceptionHolder_tao_obv_narrow (ptrdiff_t); #endif /* _MSC_VER */ virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); @@ -286,7 +286,7 @@ TAO_NAMESPACE Messaging ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index bc519bca672..d4b94ffaed6 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -321,7 +321,7 @@ Messaging::RebindPolicy::_unchecked_narrow ( RebindPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RebindPolicy::_tao_class_id ) ) @@ -339,19 +339,19 @@ Messaging::RebindPolicy::_duplicate (RebindPolicy_ptr obj) return obj; } -void *Messaging::RebindPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RebindPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RebindPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -365,7 +365,7 @@ void *Messaging::RebindPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -663,7 +663,7 @@ Messaging::RequestPriorityPolicy::_unchecked_narrow ( RequestPriorityPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RequestPriorityPolicy::_tao_class_id ) ) @@ -681,19 +681,19 @@ Messaging::RequestPriorityPolicy::_duplicate (RequestPriorityPolicy_ptr obj) return obj; } -void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RequestPriorityPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -707,7 +707,7 @@ void *Messaging::RequestPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -904,7 +904,7 @@ Messaging::ReplyPriorityPolicy::_unchecked_narrow ( ReplyPriorityPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ReplyPriorityPolicy::_tao_class_id ) ) @@ -922,19 +922,19 @@ Messaging::ReplyPriorityPolicy::_duplicate (ReplyPriorityPolicy_ptr obj) return obj; } -void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, ReplyPriorityPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -948,7 +948,7 @@ void *Messaging::ReplyPriorityPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1144,7 +1144,7 @@ Messaging::RequestStartTimePolicy::_unchecked_narrow ( RequestStartTimePolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RequestStartTimePolicy::_tao_class_id ) ) @@ -1162,19 +1162,19 @@ Messaging::RequestStartTimePolicy::_duplicate (RequestStartTimePolicy_ptr obj) return obj; } -void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RequestStartTimePolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1188,7 +1188,7 @@ void *Messaging::RequestStartTimePolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1386,7 +1386,7 @@ Messaging::RequestEndTimePolicy::_unchecked_narrow ( RequestEndTimePolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RequestEndTimePolicy::_tao_class_id ) ) @@ -1404,19 +1404,19 @@ Messaging::RequestEndTimePolicy::_duplicate (RequestEndTimePolicy_ptr obj) return obj; } -void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RequestEndTimePolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1430,7 +1430,7 @@ void *Messaging::RequestEndTimePolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1627,7 +1627,7 @@ Messaging::ReplyStartTimePolicy::_unchecked_narrow ( ReplyStartTimePolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ReplyStartTimePolicy::_tao_class_id ) ) @@ -1645,19 +1645,19 @@ Messaging::ReplyStartTimePolicy::_duplicate (ReplyStartTimePolicy_ptr obj) return obj; } -void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, ReplyStartTimePolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1671,7 +1671,7 @@ void *Messaging::ReplyStartTimePolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1868,7 +1868,7 @@ Messaging::ReplyEndTimePolicy::_unchecked_narrow ( ReplyEndTimePolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ReplyEndTimePolicy::_tao_class_id ) ) @@ -1886,19 +1886,19 @@ Messaging::ReplyEndTimePolicy::_duplicate (ReplyEndTimePolicy_ptr obj) return obj; } -void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, ReplyEndTimePolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1912,7 +1912,7 @@ void *Messaging::ReplyEndTimePolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2108,7 +2108,7 @@ Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow ( RelativeRequestTimeoutPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RelativeRequestTimeoutPolicy::_tao_class_id ) ) @@ -2126,19 +2126,19 @@ Messaging::RelativeRequestTimeoutPolicy::_duplicate (RelativeRequestTimeoutPolic return obj; } -void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RelativeRequestTimeoutPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2152,7 +2152,7 @@ void *Messaging::RelativeRequestTimeoutPolicy::_tao_QueryInterface (ptr_arith_t ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2461,7 +2461,7 @@ Messaging::RoutingPolicy::_unchecked_narrow ( RoutingPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RoutingPolicy::_tao_class_id ) ) @@ -2479,19 +2479,19 @@ Messaging::RoutingPolicy::_duplicate (RoutingPolicy_ptr obj) return obj; } -void *Messaging::RoutingPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RoutingPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RoutingPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2505,7 +2505,7 @@ void *Messaging::RoutingPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2698,7 +2698,7 @@ Messaging::MaxHopsPolicy::_unchecked_narrow ( MaxHopsPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &MaxHopsPolicy::_tao_class_id ) ) @@ -2716,19 +2716,19 @@ Messaging::MaxHopsPolicy::_duplicate (MaxHopsPolicy_ptr obj) return obj; } -void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, MaxHopsPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2742,7 +2742,7 @@ void *Messaging::MaxHopsPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2935,7 +2935,7 @@ Messaging::QueueOrderPolicy::_unchecked_narrow ( QueueOrderPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &QueueOrderPolicy::_tao_class_id ) ) @@ -2953,19 +2953,19 @@ Messaging::QueueOrderPolicy::_duplicate (QueueOrderPolicy_ptr obj) return obj; } -void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, QueueOrderPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2979,7 +2979,7 @@ void *Messaging::QueueOrderPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index d3c785c8bef..645f36e162c 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -262,7 +262,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -413,7 +413,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -532,7 +532,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -651,7 +651,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -770,7 +770,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -889,7 +889,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1008,7 +1008,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1127,7 +1127,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1278,7 +1278,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1397,7 +1397,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1516,7 +1516,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index 49fa65e3db7..aade03c45cd 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -211,7 +211,7 @@ Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow ( RelativeRoundtripTimeoutPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RelativeRoundtripTimeoutPolicy::_tao_class_id ) ) @@ -229,19 +229,19 @@ Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (RelativeRoundtripTimeoutP return obj; } -void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, RelativeRoundtripTimeoutPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -255,7 +255,7 @@ void *Messaging::RelativeRoundtripTimeoutPolicy::_tao_QueryInterface (ptr_arith_ ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index ed1a187cb72..8ebb2855cc7 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -173,7 +173,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index fb9571f2861..f194f502cf3 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -156,7 +156,7 @@ Messaging::SyncScopePolicy::_unchecked_narrow ( SyncScopePolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &SyncScopePolicy::_tao_class_id ) ) @@ -174,19 +174,19 @@ Messaging::SyncScopePolicy::_duplicate (SyncScopePolicy_ptr obj) return obj; } -void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptr_arith_t type) +void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::Messaging, SyncScopePolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -200,7 +200,7 @@ void *Messaging::SyncScopePolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index eeed76a7dc7..1d8ec8e11c6 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -162,7 +162,7 @@ TAO_NAMESPACE Messaging // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index f86393a66b2..5596d6bbf7e 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -155,7 +155,7 @@ TAO::ConnectionTimeoutPolicy::_unchecked_narrow ( ConnectionTimeoutPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ConnectionTimeoutPolicy::_tao_class_id ) ) @@ -173,19 +173,19 @@ TAO::ConnectionTimeoutPolicy::_duplicate (ConnectionTimeoutPolicy_ptr obj) return obj; } -void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type) +void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::TAO, ConnectionTimeoutPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -199,7 +199,7 @@ void *TAO::ConnectionTimeoutPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 22c8bcc26e7..226fc22df04 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -162,7 +162,7 @@ TAO_NAMESPACE TAO // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp index 516bbd60135..5293438a52e 100644 --- a/TAO/tao/PortableServer/Collocated_Object.cpp +++ b/TAO/tao/PortableServer/Collocated_Object.cpp @@ -31,8 +31,8 @@ TAO_Collocated_Object::_narrow (CORBA::Object_ptr object if (object == 0) return 0; - ptr_arith_t type = - ACE_reinterpret_cast(ptr_arith_t,TAO_Collocated_Object::_narrow); + ptrdiff_t type = + ACE_reinterpret_cast(ptrdiff_t,TAO_Collocated_Object::_narrow); void *downcast = object->_tao_QueryInterface (type); @@ -96,8 +96,8 @@ TAO_Collocated_Object::_is_equivalent (CORBA::Object_ptr other_obj if (equivalent) return 1; - ptr_arith_t type = - ACE_reinterpret_cast(ptr_arith_t,TAO_Collocated_Object::_narrow); + ptrdiff_t type = + ACE_reinterpret_cast(ptrdiff_t,TAO_Collocated_Object::_narrow); void *down = other_obj->_tao_QueryInterface (type); @@ -204,10 +204,10 @@ TAO_Collocated_Object::_get_component (ACE_ENV_SINGLE_ARG_DECL) #endif /* TAO_HAS_MINIMUM_CORBA */ void* -TAO_Collocated_Object::_tao_QueryInterface (ptr_arith_t query_type) +TAO_Collocated_Object::_tao_QueryInterface (ptrdiff_t query_type) { - ptr_arith_t type = - ACE_reinterpret_cast(ptr_arith_t,TAO_Collocated_Object::_narrow); + ptrdiff_t type = + ACE_reinterpret_cast(ptrdiff_t,TAO_Collocated_Object::_narrow); if (query_type == type) { diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h index 80bebed3af0..6fca72d7598 100644 --- a/TAO/tao/PortableServer/Collocated_Object.h +++ b/TAO/tao/PortableServer/Collocated_Object.h @@ -70,7 +70,7 @@ public: (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_MINIMUM_CORBA */ - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); private: // = Unimplemented methods diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp index a456b516bdd..64a8e5010c3 100644 --- a/TAO/tao/PortableServer/Default_ORTC.cpp +++ b/TAO/tao/PortableServer/Default_ORTC.cpp @@ -143,7 +143,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) return 0; } - return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); + return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); } const char * @@ -154,12 +154,12 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const void * #if defined (_MSC_VER) -TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t type_id) +TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t type_id) #else -TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id) +TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) #endif /* _MSC_VER */ { - if (type_id == (ptr_arith_t) &_downcast) + if (type_id == (ptrdiff_t) &_downcast) { return this; } @@ -180,7 +180,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id) #if defined (_MSC_VER) void * -TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id) +TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) { return this->TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (type_id); } @@ -356,7 +356,7 @@ operator<< ( TAO_Default_ORT::ObjectReferenceTemplate *, _tao_valuetype ), - (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast + (ptrdiff_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast ); } diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h index 634c63ed0f0..894651ffcec 100644 --- a/TAO/tao/PortableServer/Default_ORTC.h +++ b/TAO/tao/PortableServer/Default_ORTC.h @@ -134,9 +134,9 @@ TAO_NAMESPACE TAO_Default_ORT ObjectReferenceTemplate (void); virtual ~ObjectReferenceTemplate (void); - virtual void *_tao_obv_narrow (ptr_arith_t); + virtual void *_tao_obv_narrow (ptrdiff_t); #if defined (_MSC_VER) - virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t); + virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t); #endif /* _MSC_VER */ virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp index aa15783ac97..ffb1cab1228 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.cpp +++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp @@ -2314,7 +2314,7 @@ ImplementationRepository::Locator::_unchecked_narrow ( Locator_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Locator::_tao_class_id ) ) @@ -2364,19 +2364,19 @@ ImplementationRepository::Locator::_is_a ( } } -void *ImplementationRepository::Locator::_tao_QueryInterface (ptr_arith_t type) +void *ImplementationRepository::Locator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::ImplementationRepository, Locator)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::ImplementationRepository::Administration::_tao_class_id) ) { @@ -2390,7 +2390,7 @@ void *ImplementationRepository::Locator::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h index bfcea3ff688..1f3cf853abb 100644 --- a/TAO/tao/PortableServer/ImR_LocatorC.h +++ b/TAO/tao/PortableServer/ImR_LocatorC.h @@ -243,7 +243,7 @@ TAO_NAMESPACE ImplementationRepository ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 5985e42d15c..40e50776681 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -854,7 +854,7 @@ ImplementationRepository::ServerObject::_unchecked_narrow ( ServerObject_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServerObject::_tao_class_id ) ) @@ -900,19 +900,19 @@ ImplementationRepository::ServerObject::_is_a ( } } -void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type) +void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -6289,7 +6289,7 @@ ImplementationRepository::Administration::_unchecked_narrow ( Administration_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Administration::_tao_class_id ) ) @@ -6335,19 +6335,19 @@ ImplementationRepository::Administration::_is_a ( } } -void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type) +void *ImplementationRepository::Administration::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -7616,7 +7616,7 @@ ImplementationRepository::ServerInformationIterator::_unchecked_narrow ( ServerInformationIterator_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServerInformationIterator::_tao_class_id ) ) @@ -7662,19 +7662,19 @@ ImplementationRepository::ServerInformationIterator::_is_a ( } } -void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type) +void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h index c9634606db9..6a8b4df5b28 100644 --- a/TAO/tao/PortableServer/ImplRepoC.h +++ b/TAO/tao/PortableServer/ImplRepoC.h @@ -186,7 +186,7 @@ TAO_NAMESPACE ImplementationRepository ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1049,7 +1049,7 @@ TAO_NAMESPACE ImplementationRepository ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1548,7 +1548,7 @@ TAO_NAMESPACE ImplementationRepository ACE_ENV_ARG_DECL_WITH_DEFAULTS ); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index ecea68f638b..b97eddf2681 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -108,12 +108,12 @@ TAO_POA_Manager::generate_manager_id (void) const if (sizeof (this) == 4) // 32 bit address id = ACE_static_cast (PortableInterceptor::AdapterManagerId, - ACE_reinterpret_cast (ptr_arith_t, this)); + ACE_reinterpret_cast (ptrdiff_t, this)); else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits id = ACE_static_cast (PortableInterceptor::AdapterManagerId, - ACE_reinterpret_cast (ptr_arith_t, this) & 0xFFFFFFFFu); + ACE_reinterpret_cast (ptrdiff_t, this) & 0xFFFFFFFFu); // @@ If we ever hit a platform where neither of the above cases are // satisfied, we're up the creek! diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 67bb48d6771..1e8d522fcb4 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -992,7 +992,7 @@ PortableServer::ThreadPolicy::_unchecked_narrow ( ThreadPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ThreadPolicy::_tao_class_id ) ) @@ -1010,19 +1010,19 @@ PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj) return obj; } -void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ThreadPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1036,7 +1036,7 @@ void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1286,7 +1286,7 @@ PortableServer::LifespanPolicy::_unchecked_narrow ( LifespanPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &LifespanPolicy::_tao_class_id ) ) @@ -1304,19 +1304,19 @@ PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj) return obj; } -void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, LifespanPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1330,7 +1330,7 @@ void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1581,7 +1581,7 @@ PortableServer::IdUniquenessPolicy::_unchecked_narrow ( IdUniquenessPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &IdUniquenessPolicy::_tao_class_id ) ) @@ -1599,19 +1599,19 @@ PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj) return obj; } -void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, IdUniquenessPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1625,7 +1625,7 @@ void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1877,7 +1877,7 @@ PortableServer::IdAssignmentPolicy::_unchecked_narrow ( IdAssignmentPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &IdAssignmentPolicy::_tao_class_id ) ) @@ -1895,19 +1895,19 @@ PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj) return obj; } -void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, IdAssignmentPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1921,7 +1921,7 @@ void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2185,7 +2185,7 @@ PortableServer::ImplicitActivationPolicy::_unchecked_narrow ( ImplicitActivationPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ImplicitActivationPolicy::_tao_class_id ) ) @@ -2203,19 +2203,19 @@ PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_p return obj; } -void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ImplicitActivationPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2229,7 +2229,7 @@ void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2486,7 +2486,7 @@ PortableServer::ServantRetentionPolicy::_unchecked_narrow ( ServantRetentionPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServantRetentionPolicy::_tao_class_id ) ) @@ -2504,19 +2504,19 @@ PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr o return obj; } -void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ServantRetentionPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2530,7 +2530,7 @@ void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t t ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2800,7 +2800,7 @@ PortableServer::RequestProcessingPolicy::_unchecked_narrow ( RequestProcessingPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RequestProcessingPolicy::_tao_class_id ) ) @@ -2818,19 +2818,19 @@ PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr return obj; } -void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, RequestProcessingPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2844,7 +2844,7 @@ void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3058,7 +3058,7 @@ PortableServer::POAManager::_unchecked_narrow ( POAManager_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &POAManager::_tao_class_id ) ) @@ -3076,19 +3076,19 @@ PortableServer::POAManager::_duplicate (POAManager_ptr obj) return obj; } -void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::POAManager::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, POAManager)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3419,7 +3419,7 @@ PortableServer::AdapterActivator::_unchecked_narrow ( AdapterActivator_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &AdapterActivator::_tao_class_id ) ) @@ -3437,19 +3437,19 @@ PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj) return obj; } -void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::AdapterActivator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, AdapterActivator)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3645,7 +3645,7 @@ PortableServer::ServantManager::_unchecked_narrow ( ServantManager_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServantManager::_tao_class_id ) ) @@ -3663,19 +3663,19 @@ PortableServer::ServantManager::_duplicate (ServantManager_ptr obj) return obj; } -void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::ServantManager::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3870,7 +3870,7 @@ PortableServer::ServantActivator::_unchecked_narrow ( ServantActivator_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServantActivator::_tao_class_id ) ) @@ -3888,19 +3888,19 @@ PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj) return obj; } -void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::ServantActivator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ServantActivator)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id) ) { @@ -3914,7 +3914,7 @@ void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -4110,7 +4110,7 @@ PortableServer::ServantLocator::_unchecked_narrow ( ServantLocator_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServantLocator::_tao_class_id ) ) @@ -4128,19 +4128,19 @@ PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj) return obj; } -void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::ServantLocator::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ServantLocator)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id) ) { @@ -4154,7 +4154,7 @@ void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -4351,7 +4351,7 @@ PortableServer::POA::_unchecked_narrow ( POA_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &POA::_tao_class_id ) ) @@ -4369,19 +4369,19 @@ PortableServer::POA::_duplicate (POA_ptr obj) return obj; } -void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::POA::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, POA)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -5942,7 +5942,7 @@ PortableServer::Current::_unchecked_narrow ( Current_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Current::_tao_class_id ) ) @@ -5960,19 +5960,19 @@ PortableServer::Current::_duplicate (Current_ptr obj) return obj; } -void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type) +void *PortableServer::Current::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::PortableServer, Current)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Current::_tao_class_id) ) { @@ -5986,7 +5986,7 @@ void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h index 3e5a3a23c4d..f8ea5840b55 100644 --- a/TAO/tao/PortableServer/PortableServerC.h +++ b/TAO/tao/PortableServer/PortableServerC.h @@ -479,7 +479,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -599,7 +599,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -717,7 +717,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -835,7 +835,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -955,7 +955,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1077,7 +1077,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1200,7 +1200,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1422,7 +1422,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1528,7 +1528,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1620,7 +1620,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1746,7 +1746,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1876,7 +1876,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2879,7 +2879,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -3041,7 +3041,7 @@ TAO_NAMESPACE PortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i index 4bb0cc01dec..20151e72852 100644 --- a/TAO/tao/PortableServer/Servant_Base.i +++ b/TAO/tao/PortableServer/Servant_Base.i @@ -4,7 +4,7 @@ ACE_INLINE u_long TAO_Servant_Hash::operator () (PortableServer::Servant servant) const { return ACE_static_cast (u_long, - ACE_reinterpret_cast (ptr_arith_t, servant)); + ACE_reinterpret_cast (ptrdiff_t, servant)); } ACE_INLINE TAO_Stub * diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp index c9c0b89e82c..771b7c59eff 100644 --- a/TAO/tao/PortableServer/ServerRequestInfo.cpp +++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp @@ -55,12 +55,12 @@ TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) if (sizeof (this) == 4) // 32 bit address id = ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptr_arith_t, + ACE_reinterpret_cast (ptrdiff_t, &(this->server_request_))); else if (sizeof (this) == 8) // 64 bit address -- use lower 32 bits id = ACE_static_cast (CORBA::ULong, - ACE_reinterpret_cast (ptr_arith_t, + ACE_reinterpret_cast (ptrdiff_t, &(this->server_request_)) & 0xFFFFFFFFu); else diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 6027f7117d5..c390c86e335 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -107,4 +107,3 @@ private: #include "ace/post.h" #endif /* TAO_PSEUDO_VAROUT_T_H */ - diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp index 09707a67164..90d88aa961f 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp @@ -32,7 +32,7 @@ TAO_Network_Priority_Mapping_Manager::_unchecked_narrow (CORBA::Object_ptr obj TAO_Network_Priority_Mapping_Manager_ptr, obj->_tao_QueryInterface ( - ACE_reinterpret_cast (ptr_arith_t, + ACE_reinterpret_cast (ptrdiff_t, &TAO_Network_Priority_Mapping_Manager::_narrow) ) ); @@ -47,14 +47,14 @@ TAO_Network_Priority_Mapping_Manager::_duplicate (TAO_Network_Priority_Mapping_M } void * -TAO_Network_Priority_Mapping_Manager::_tao_QueryInterface (ptr_arith_t type) +TAO_Network_Priority_Mapping_Manager::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_Network_Priority_Mapping_Manager::_narrow)) retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index b4cdfb51a80..83ac4ad5a64 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -78,7 +78,7 @@ public: return (TAO_Network_Priority_Mapping_Manager_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 0550a51140b..b369b341dfc 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -32,7 +32,7 @@ TAO_Priority_Mapping_Manager::_unchecked_narrow (CORBA::Object_ptr obj TAO_Priority_Mapping_Manager_ptr, obj->_tao_QueryInterface ( - ACE_reinterpret_cast (ptr_arith_t, + ACE_reinterpret_cast (ptrdiff_t, &TAO_Priority_Mapping_Manager::_narrow) ) ); @@ -47,14 +47,14 @@ TAO_Priority_Mapping_Manager::_duplicate (TAO_Priority_Mapping_Manager_ptr obj) } void * -TAO_Priority_Mapping_Manager::_tao_QueryInterface (ptr_arith_t type) +TAO_Priority_Mapping_Manager::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast - (ptr_arith_t, + (ptrdiff_t, &TAO_Priority_Mapping_Manager::_narrow)) retv = ACE_reinterpret_cast (void*, this); - else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) + else if (type == ACE_reinterpret_cast (ptrdiff_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 039e62c8e87..8fac2fcce2a 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -78,7 +78,7 @@ public: return (TAO_Priority_Mapping_Manager_ptr)0; } - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index d6bb5be2af1..63185a99cb2 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -712,7 +712,7 @@ RTCORBA::PriorityModelPolicy::_unchecked_narrow ( PriorityModelPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &PriorityModelPolicy::_tao_class_id ) ) @@ -730,19 +730,19 @@ RTCORBA::PriorityModelPolicy::_duplicate (PriorityModelPolicy_ptr obj) return obj; } -void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, PriorityModelPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -756,7 +756,7 @@ void *RTCORBA::PriorityModelPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -951,7 +951,7 @@ RTCORBA::ThreadpoolPolicy::_unchecked_narrow ( ThreadpoolPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ThreadpoolPolicy::_tao_class_id ) ) @@ -969,19 +969,19 @@ RTCORBA::ThreadpoolPolicy::_duplicate (ThreadpoolPolicy_ptr obj) return obj; } -void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ThreadpoolPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -995,7 +995,7 @@ void *RTCORBA::ThreadpoolPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1190,7 +1190,7 @@ RTCORBA::ProtocolProperties::_unchecked_narrow ( ProtocolProperties_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ProtocolProperties::_tao_class_id ) ) @@ -1208,19 +1208,19 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj) return obj; } -void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -1776,7 +1776,7 @@ RTCORBA::ServerProtocolPolicy::_unchecked_narrow ( ServerProtocolPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ServerProtocolPolicy::_tao_class_id ) ) @@ -1794,19 +1794,19 @@ RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj) return obj; } -void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -1820,7 +1820,7 @@ void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2017,7 +2017,7 @@ RTCORBA::ClientProtocolPolicy::_unchecked_narrow ( ClientProtocolPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ClientProtocolPolicy::_tao_class_id ) ) @@ -2035,19 +2035,19 @@ RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj) return obj; } -void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2061,7 +2061,7 @@ void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2258,7 +2258,7 @@ RTCORBA::PrivateConnectionPolicy::_unchecked_narrow ( PrivateConnectionPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &PrivateConnectionPolicy::_tao_class_id ) ) @@ -2276,19 +2276,19 @@ RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj) return obj; } -void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -2302,7 +2302,7 @@ void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2499,7 +2499,7 @@ RTCORBA::TCPProtocolProperties::_unchecked_narrow ( TCPProtocolProperties_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TCPProtocolProperties::_tao_class_id ) ) @@ -2517,19 +2517,19 @@ RTCORBA::TCPProtocolProperties::_duplicate (TCPProtocolProperties_ptr obj) return obj; } -void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, TCPProtocolProperties)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id) ) { @@ -2543,7 +2543,7 @@ void *RTCORBA::TCPProtocolProperties::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2740,7 +2740,7 @@ RTCORBA::GIOPProtocolProperties::_unchecked_narrow ( GIOPProtocolProperties_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &GIOPProtocolProperties::_tao_class_id ) ) @@ -2758,19 +2758,19 @@ RTCORBA::GIOPProtocolProperties::_duplicate (GIOPProtocolProperties_ptr obj) return obj; } -void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, GIOPProtocolProperties)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id) ) { @@ -2784,7 +2784,7 @@ void *RTCORBA::GIOPProtocolProperties::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -2981,7 +2981,7 @@ RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( UnixDomainProtocolProperties_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &UnixDomainProtocolProperties::_tao_class_id ) ) @@ -2999,19 +2999,19 @@ RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ return obj; } -void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, UnixDomainProtocolProperties)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id) ) { @@ -3025,7 +3025,7 @@ void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t ty ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3226,7 +3226,7 @@ RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( SharedMemoryProtocolProperties_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &SharedMemoryProtocolProperties::_tao_class_id ) ) @@ -3244,19 +3244,19 @@ RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolPropert return obj; } -void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, SharedMemoryProtocolProperties)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_tao_class_id) ) { @@ -3270,7 +3270,7 @@ void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3750,7 +3750,7 @@ RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow ( PriorityBandedConnectionPolicy_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &PriorityBandedConnectionPolicy::_tao_class_id ) ) @@ -3768,19 +3768,19 @@ RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPol return obj; } -void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Policy::_tao_class_id) ) { @@ -3794,7 +3794,7 @@ void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -3995,7 +3995,7 @@ RTCORBA::Current::_unchecked_narrow ( Current_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Current::_tao_class_id ) ) @@ -4013,19 +4013,19 @@ RTCORBA::Current::_duplicate (Current_ptr obj) return obj; } -void *RTCORBA::Current::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::Current::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, Current)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::CORBA::Current::_tao_class_id) ) { @@ -4039,7 +4039,7 @@ void *RTCORBA::Current::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -4228,7 +4228,7 @@ RTCORBA::Mutex::_unchecked_narrow ( Mutex_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &Mutex::_tao_class_id ) ) @@ -4246,19 +4246,19 @@ RTCORBA::Mutex::_duplicate (Mutex_ptr obj) return obj; } -void *RTCORBA::Mutex::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::Mutex::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, Mutex)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { @@ -4447,7 +4447,7 @@ RTCORBA::RTORB::_unchecked_narrow ( RTORB_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &RTORB::_tao_class_id ) ) @@ -4465,19 +4465,19 @@ RTCORBA::RTORB::_duplicate (RTORB_ptr obj) return obj; } -void *RTCORBA::RTORB::_tao_QueryInterface (ptr_arith_t type) +void *RTCORBA::RTORB::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTCORBA, RTORB)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h index 0178d4a2f11..63321837311 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.h +++ b/TAO/tao/RTCORBA/RTCORBAC.h @@ -371,7 +371,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -490,7 +490,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -595,7 +595,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -807,7 +807,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -926,7 +926,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1035,7 +1035,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1265,7 +1265,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1369,7 +1369,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1515,7 +1515,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1682,7 +1682,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -1886,7 +1886,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2011,7 +2011,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2146,7 +2146,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -2518,7 +2518,7 @@ TAO_NAMESPACE RTCORBA // TAO_IDL - Generated from // be/be_visitor_interface/interface_ch.cpp:207 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp index 775e55da40b..3373ee23fdd 100644 --- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp +++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp @@ -305,7 +305,7 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile ( TAO_Private_Transport_Descriptor private_desc ( invocation->endpoint (), ACE_static_cast (long, - ACE_reinterpret_cast (ptr_arith_t, + ACE_reinterpret_cast (ptrdiff_t, invocation->stub ()))); status = diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp index 567ed181824..a4ac6e8145b 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp +++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp @@ -155,7 +155,7 @@ RTPortableServer::POA::_unchecked_narrow ( POA_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &POA::_tao_class_id ) ) @@ -173,19 +173,19 @@ RTPortableServer::POA::_duplicate (POA_ptr obj) return obj; } -void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type) +void *RTPortableServer::POA::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::RTPortableServer, POA)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &::PortableServer::POA::_tao_class_id) ) { @@ -199,7 +199,7 @@ void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type) ); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index 8c97c6ecdd9..4312708003a 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -206,7 +206,7 @@ TAO_NAMESPACE RTPortableServer // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp index 8c8c357c8c2..c45b6fe23a5 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp @@ -165,7 +165,7 @@ CORBA::TypeCodeFactory::_unchecked_narrow ( TypeCodeFactory_ptr, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TypeCodeFactory::_tao_class_id ) ) @@ -183,19 +183,19 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj) return obj; } -void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type) +void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptrdiff_t type) { void *retv = 0; if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &ACE_NESTED_CLASS (::CORBA, TypeCodeFactory)::_tao_class_id) ) { retv = ACE_reinterpret_cast (void*, this); } else if (type == ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &CORBA::Object::_tao_class_id) ) { diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h index b901608f52b..cc1360c19e9 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h @@ -397,7 +397,7 @@ TAO_NAMESPACE CORBA // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211 - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual const char* _interface_repository_id (void) const; virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp index d84f9f00c52..baa3bf96153 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp @@ -34,7 +34,7 @@ TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj TAO_TypeCodeFactory_i *, obj->_tao_QueryInterface ( ACE_reinterpret_cast ( - ptr_arith_t, + ptrdiff_t, &TAO_TypeCodeFactory_i::_narrow ) ) @@ -42,10 +42,10 @@ TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj } void * -TAO_TypeCodeFactory_i::_tao_QueryInterface (ptr_arith_t type) +TAO_TypeCodeFactory_i::_tao_QueryInterface (ptrdiff_t type) { - ptr_arith_t mytype = - ACE_reinterpret_cast (ptr_arith_t, + ptrdiff_t mytype = + ACE_reinterpret_cast (ptrdiff_t, &TAO_TypeCodeFactory_i::_narrow); if (type == mytype) { @@ -1564,8 +1564,8 @@ TAO_TypeCodeFactory_i::update_map ( TAO_OutputCDR &cdr ) { - ptr_arith_t unaligned_offset = - ACE_static_cast (ptr_arith_t, + ptrdiff_t unaligned_offset = + ACE_static_cast (ptrdiff_t, cdr.total_length ()); CORBA::Long aligned_offset = @@ -1633,7 +1633,7 @@ TAO_TypeCodeFactory_i::update_map ( else { const char *slot = - member_tc->buffer_ + ACE_static_cast (ptr_arith_t, + member_tc->buffer_ + ACE_static_cast (ptrdiff_t, *list_entry); CORBA::Long recursion_offset = diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index 9749a703b84..20a6f6dc399 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -52,7 +52,7 @@ public: CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS); - virtual void *_tao_QueryInterface (ptr_arith_t type); + virtual void *_tao_QueryInterface (ptrdiff_t type); virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, |