diff options
Diffstat (limited to 'TAO/tao/ObjectReferenceTemplateC.cpp')
-rw-r--r-- | TAO/tao/ObjectReferenceTemplateC.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp index 55c62cf0703..d3defb5d1a5 100644 --- a/TAO/tao/ObjectReferenceTemplateC.cpp +++ b/TAO/tao/ObjectReferenceTemplateC.cpp @@ -356,7 +356,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v) return 0; } - return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptr_arith_t) &_downcast); + return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); } const char * @@ -367,12 +367,12 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_repository_id (void) const void * #if defined (_MSC_VER) -PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t type_id) +PortableInterceptor::ObjectReferenceFactory::PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptrdiff_t type_id) #else -PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id) +PortableInterceptor::ObjectReferenceFactory::_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; } @@ -384,7 +384,7 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_i #if defined (_MSC_VER) void * -PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptr_arith_t type_id) +PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptrdiff_t type_id) { return this->PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (type_id); } @@ -547,7 +547,7 @@ PortableInterceptor::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 * @@ -558,12 +558,12 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_repository_id (void) cons void * #if defined (_MSC_VER) -PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t type_id) +PortableInterceptor::ObjectReferenceTemplate::PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t type_id) #else -PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id) +PortableInterceptor::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; } @@ -584,7 +584,7 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_ #if defined (_MSC_VER) void * -PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptr_arith_t type_id) +PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) { return this->PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (type_id); } @@ -1158,7 +1158,7 @@ operator<< ( PortableInterceptor::ObjectReferenceFactory *, _tao_valuetype ), - (ptr_arith_t) &PortableInterceptor::ObjectReferenceFactory::_downcast + (ptrdiff_t) &PortableInterceptor::ObjectReferenceFactory::_downcast ); } @@ -1210,7 +1210,7 @@ operator<< ( PortableInterceptor::ObjectReferenceTemplate *, _tao_valuetype ), - (ptr_arith_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast + (ptrdiff_t) &PortableInterceptor::ObjectReferenceTemplate::_downcast ); } |