diff options
Diffstat (limited to 'TAO/tao/PortableServer/Default_ORTC.cpp')
-rw-r--r-- | TAO/tao/PortableServer/Default_ORTC.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp index 1914b77bd82..320fcfeaae9 100644 --- a/TAO/tao/PortableServer/Default_ORTC.cpp +++ b/TAO/tao/PortableServer/Default_ORTC.cpp @@ -26,7 +26,7 @@ #include "Default_ORTC.h" #include "tao/Any_T.h" -#include "tao/ValueFactory.h" +#include "tao/Valuetype/ValueFactory.h" #if defined (__BORLANDC__) #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig @@ -302,7 +302,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 * @@ -313,12 +313,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; } @@ -339,7 +339,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); } @@ -517,7 +517,7 @@ operator<< ( TAO_Default_ORT::ObjectReferenceTemplate *, _tao_valuetype ), - (ptr_arith_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast + (ptrdiff_t) &TAO_Default_ORT::ObjectReferenceTemplate::_downcast ); } |