ChangeLogTag:Thu May 1 11:25:42 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

35 files changed, 188 insertions, 188 deletions

diff --git a/TAO/tao/AbstractBase.cpp b/TAO/tao/AbstractBase.cpp
index 0fadc52bbe9..10edad454c2 100644
--- a/TAO/tao/AbstractBase.cpp
+++ b/TAO/tao/AbstractBase.cpp
@@ -73,12 +73,12 @@ CORBA::AbstractBase::_is_a (const char *type_id
 }
 
 void *
-CORBA::AbstractBase::_tao_QueryInterface (ptr_arith_t type)
+CORBA::AbstractBase::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &CORBA::AbstractBase::_tao_class_id)
             )
     {
diff --git a/TAO/tao/AbstractBase.h b/TAO/tao/AbstractBase.h
index d7551abafe7..04a87da98e7 100644
--- a/TAO/tao/AbstractBase.h
+++ b/TAO/tao/AbstractBase.h
@@ -77,10 +77,10 @@ namespace CORBA
 
     virtual CORBA::Boolean _is_a (const char * type_id
                                   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 const char * _tao_obv_repository_id (void) const;
-    virtual void * _tao_obv_narrow (ptr_arith_t type_id);
+    virtual void * _tao_obv_narrow (ptrdiff_t type_id);
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR & strm);
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR & strm);
 
diff --git a/TAO/tao/AbstractBase.inl b/TAO/tao/AbstractBase.inl
index 4e09511ab49..e71e029601c 100644
--- a/TAO/tao/AbstractBase.inl
+++ b/TAO/tao/AbstractBase.inl
@@ -55,7 +55,7 @@ CORBA::AbstractBase::_tao_obv_repository_id (void) const
 
 ACE_INLINE
 void *
-CORBA::AbstractBase::_tao_obv_narrow (ptr_arith_t /* type_id */)
+CORBA::AbstractBase::_tao_obv_narrow (ptrdiff_t /* type_id */)
 {
   return this;
 }
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index f4d2b5acc09..c6af1f3cfa1 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -509,7 +509,7 @@ TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
            ACE_Message_Block (size + 2 * ACE_CDR::MAX_ALIGNMENT));
 
   ACE_CDR::mb_align (this->cdr_);
-  ptr_arith_t offset = ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
+  ptrdiff_t offset = ptrdiff_t (begin) % ACE_CDR::MAX_ALIGNMENT;
   this->cdr_->rd_ptr (offset);
   this->cdr_->wr_ptr (offset + size);
 
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index e2314ddfc3b..27527bf7b4e 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -375,7 +375,7 @@ TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL)
   // 32 bit address
   if (sizeof (this) == 4)
     id = ACE_static_cast (CORBA::ULong,
-                          ACE_reinterpret_cast (ptr_arith_t,
+                          ACE_reinterpret_cast (ptrdiff_t,
                                                 this->invocation_));
 
   // 64 bit address -- bits 8 through 39  (see notes above!)
@@ -386,13 +386,13 @@ TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL)
            && sizeof (*(this->invocation_)) > 256 /* 2 << 8 */)
     id =
       (ACE_static_cast (CORBA::ULong,
-       ACE_reinterpret_cast (ptr_arith_t,
+       ACE_reinterpret_cast (ptrdiff_t,
                              this->invocation_)) >> 8) & 0xFFFFFFFFu;
 
   // 64 bit address -- lower 32 bits
   else if (sizeof (this) == 8)
     id = ACE_static_cast (CORBA::ULong,
-                          ACE_reinterpret_cast (ptr_arith_t,
+                          ACE_reinterpret_cast (ptrdiff_t,
                                                 this->invocation_)) &
                          0xFFFFFFFFu;
 
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 91b138c0961..bab962c2917 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -156,7 +156,7 @@ CORBA::Current::_unchecked_narrow (
           Current_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &Current::_tao_class_id
                 )
             )
@@ -174,19 +174,19 @@ CORBA::Current::_duplicate (Current_ptr obj)
   return obj;
 }
 
-void *CORBA::Current::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::Current::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, Current)::_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/CurrentC.h b/TAO/tao/CurrentC.h
index 07067055078..2ec0188944c 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -129,7 +129,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/DomainC.cpp b/TAO/tao/DomainC.cpp
index efc91a900d4..4f765bd1b55 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -647,7 +647,7 @@ CORBA::DomainManager::_unchecked_narrow (
           DomainManager_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &DomainManager::_tao_class_id
                 )
             )
@@ -693,19 +693,19 @@ CORBA::DomainManager::_is_a (
     }
 }
 
-void *CORBA::DomainManager::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::DomainManager::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, DomainManager)::_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)
              )
     {
@@ -1381,7 +1381,7 @@ CORBA::ConstructionPolicy::_unchecked_narrow (
           ConstructionPolicy_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ConstructionPolicy::_tao_class_id
                 )
             )
@@ -1431,19 +1431,19 @@ CORBA::ConstructionPolicy::_is_a (
     }
 }
 
-void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::ConstructionPolicy::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, ConstructionPolicy)::_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)
             )
     {
@@ -1457,7 +1457,7 @@ void *CORBA::ConstructionPolicy::_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/DomainC.h b/TAO/tao/DomainC.h
index c5627164d82..c15dfdffe3a 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -151,7 +151,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);
@@ -418,7 +418,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/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index f5b43e38bf4..5384edee8fe 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -176,10 +176,10 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
   if (reply.is_dsi_ == 1)
     {
       // @@ Much of this code is GIOP 1.1 specific and should be
-      ptr_arith_t target = reply.dsi_nvlist_align_;
+      ptrdiff_t target = reply.dsi_nvlist_align_;
 
-      ptr_arith_t current =
-        ptr_arith_t (output.current_alignment ()) % ACE_CDR::MAX_ALIGNMENT;
+      ptrdiff_t current =
+        ptrdiff_t (output.current_alignment ()) % ACE_CDR::MAX_ALIGNMENT;
 
       CORBA::ULong pad = 0;
 
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index e66026598cf..4e84e29ea81 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -171,7 +171,7 @@ IOP::Codec::_unchecked_narrow (
           Codec_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &Codec::_tao_class_id
                 )
             )
@@ -189,19 +189,19 @@ IOP::Codec::_duplicate (Codec_ptr obj)
   return obj;
 }
 
-void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type)
+void *IOP::Codec::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::IOP, Codec)::_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)
              )
     {
@@ -943,7 +943,7 @@ IOP::CodecFactory::_unchecked_narrow (
           CodecFactory_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &CodecFactory::_tao_class_id
                 )
             )
@@ -961,19 +961,19 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
   return obj;
 }
 
-void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type)
+void *IOP::CodecFactory::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::IOP, CodecFactory)::_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/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index ab00c058bcc..dd398ccb2b0 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -347,7 +347,7 @@ TAO_NAMESPACE  IOP
     // 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);
@@ -560,7 +560,7 @@ TAO_NAMESPACE  IOP
     // 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/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index d9612125191..6ee180b2901 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -45,7 +45,7 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum
   // 64-bit platforms.
 
   CORBA::ULong hash = ACE_static_cast (CORBA::ULong,
-                        ACE_reinterpret_cast (ptr_arith_t, this));
+                        ACE_reinterpret_cast (ptrdiff_t, this));
 
   return hash % maximum;
 }
@@ -79,14 +79,14 @@ CORBA::LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
 
 #if 0
 void *
-CORBA::LocalObject::_tao_QueryInterface (ptr_arith_t type)
+CORBA::LocalObject::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
-  if (type == ACE_reinterpret_cast (ptr_arith_t,
+  if (type == ACE_reinterpret_cast (ptrdiff_t,
                                     &CORBA::LocalObject::_narrow))
     retv = ACE_reinterpret_cast (void *, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t,
+  else if (type == ACE_reinterpret_cast (ptrdiff_t,
                                          &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
                                  ACE_static_cast (CORBA::Object_ptr,
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
index 1e877211c03..07ba7bc046f 100644
--- a/TAO/tao/LocalObject.i
+++ b/TAO/tao/LocalObject.i
@@ -33,7 +33,7 @@ CORBA::LocalObject::_narrow (CORBA::Object_ptr obj
             CORBA::LocalObject_ptr,
             obj->_tao_QueryInterface (
                 ACE_reinterpret_cast (
-                    ptr_arith_t,
+                    ptrdiff_t,
                     &CORBA::LocalObject::_narrow
                   )
               )
@@ -55,7 +55,7 @@ CORBA::LocalObject::_unchecked_narrow (CORBA::Object_ptr obj
              CORBA::LocalObject_ptr,
              obj->_tao_QueryInterface (
                  ACE_reinterpret_cast (
-                     ptr_arith_t,
+                     ptrdiff_t,
                      &CORBA::LocalObject::_narrow
                    )
                )
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 05c4988a592..2c2828a79c2 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -431,7 +431,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
     }
 }
 
-ptr_arith_t
+ptrdiff_t
 CORBA::NVList::_tao_target_alignment (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -445,7 +445,7 @@ CORBA::NVList::_tao_target_alignment (void)
     }
 
   const char* rd = this->incoming_->start ()->rd_ptr ();
-  return ptr_arith_t(rd) % ACE_CDR::MAX_ALIGNMENT;
+  return ptrdiff_t(rd) % ACE_CDR::MAX_ALIGNMENT;
 }
 
 void
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index e19d7b5840e..83c8138fbd6 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -217,7 +217,7 @@ namespace CORBA
      * re-alignment.
      * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors.
      */
-    ptr_arith_t _tao_target_alignment (void);
+    ptrdiff_t _tao_target_alignment (void);
 
     /**
      * If this list is used by a DII request, this will tell us if
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index 19615f76a22..bf42606c381 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -314,7 +314,7 @@ TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_unchecked_narrow (
               (
                 ACE_reinterpret_cast
                   (
-                    ptr_arith_t,
+                    ptrdiff_t,
                     &TAO_ORBInitInfo::_narrow
                   )
               )
@@ -329,15 +329,15 @@ TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj)
   return obj;
 }
 
-void *TAO_ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
+void *TAO_ORBInitInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
+    (ptrdiff_t,
       &TAO_ORBInitInfo::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
+    (ptrdiff_t,
       &::PortableInterceptor::ORBInitInfo::_narrow))
     retv = ACE_reinterpret_cast
       (
@@ -348,7 +348,7 @@ void *TAO_ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
             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/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index e602459fd6b..261b9191b17 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -227,7 +227,7 @@ public:
       return (TAO_ORBInitInfo_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/Object.cpp b/TAO/tao/Object.cpp
index 7c6e2679ace..80c44ae9ea4 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -124,7 +124,7 @@ CORBA::Object::_unchecked_narrow (CORBA::Object_ptr obj
           CORBA::Object_ptr,
           obj->_tao_QueryInterface (
                    ACE_reinterpret_cast (
-                       ptr_arith_t,
+                       ptrdiff_t,
                        &CORBA::Object::_tao_class_id
                      )
                  )
@@ -294,7 +294,7 @@ CORBA::Object::_hash (CORBA::ULong maximum
       // large enough to hold an address to avoid compile-time
       // warnings on some 64-bit platforms.
       CORBA::ULong hash = ACE_static_cast (CORBA::ULong,
-                            ACE_reinterpret_cast (ptr_arith_t, this));
+                            ACE_reinterpret_cast (ptrdiff_t, this));
 
       return hash % maximum;
     }
@@ -342,11 +342,11 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void *
-CORBA::Object::_tao_QueryInterface (ptr_arith_t type)
+CORBA::Object::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
-  if (type == ACE_reinterpret_cast (ptr_arith_t,
+  if (type == ACE_reinterpret_cast (ptrdiff_t,
                                     &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *, this);
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 5fcfc97f22d..2ff2065051f 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -263,7 +263,7 @@ namespace CORBA
 
     /// Downcasting this object pointer to some other derived class.
     /// This QueryInterface stuff only work for local object.
-    virtual void * _tao_QueryInterface (ptr_arith_t type);
+    virtual void * _tao_QueryInterface (ptrdiff_t type);
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
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
       );
 }
 
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index dfec72ea8c9..f577abfc4d2 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -180,9 +180,9 @@ TAO_NAMESPACE  PortableInterceptor
     ObjectReferenceFactory (void);
     virtual ~ObjectReferenceFactory (void);
 
-    virtual void *_tao_obv_narrow (ptr_arith_t);
+    virtual void *_tao_obv_narrow (ptrdiff_t);
 #if defined (_MSC_VER)
-    virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptr_arith_t);
+    virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptrdiff_t);
 #endif /* _MSC_VER */
 
   private:
@@ -264,9 +264,9 @@ TAO_NAMESPACE  PortableInterceptor
     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 *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptr_arith_t);
+    virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t);
 #endif /* _MSC_VER */
 
   private:
diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h
index 770fe110aee..a226656fb47 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -64,7 +64,7 @@ public:
 
   /// Info required for DSI optimization that pads the outgoing
   /// CDR stream according to the alignment of the NVList.
-  ptr_arith_t dsi_nvlist_align_;
+  ptrdiff_t dsi_nvlist_align_;
 
   /**
    * Get and Set methods for the service context list that we dont
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 10a0dcb9fae..6eefea31d2d 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -1606,7 +1606,7 @@ CORBA::Policy::_unchecked_narrow (
           Policy_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &Policy::_tao_class_id
                 )
             )
@@ -1652,19 +1652,19 @@ CORBA::Policy::_is_a (
     }
 }
 
-void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::Policy::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, Policy)::_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)
              )
     {
@@ -1939,7 +1939,7 @@ CORBA::PolicyManager::_unchecked_narrow (
           PolicyManager_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &PolicyManager::_tao_class_id
                 )
             )
@@ -1957,19 +1957,19 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
   return obj;
 }
 
-void *CORBA::PolicyManager::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::PolicyManager::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_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)
              )
     {
@@ -2161,7 +2161,7 @@ CORBA::PolicyCurrent::_unchecked_narrow (
           PolicyCurrent_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &PolicyCurrent::_tao_class_id
                 )
             )
@@ -2179,19 +2179,19 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
   return obj;
 }
 
-void *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::PolicyCurrent::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_tao_class_id)
             )
     {
@@ -2205,7 +2205,7 @@ void *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type)
           );
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &::CORBA::Current::_tao_class_id)
             )
     {
@@ -2219,7 +2219,7 @@ void *CORBA::PolicyCurrent::_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/PolicyC.h b/TAO/tao/PolicyC.h
index 29a87fadf5f..b4e053ec779 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -355,7 +355,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);
@@ -674,7 +674,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);
@@ -767,7 +767,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/PollableC.cpp b/TAO/tao/PollableC.cpp
index 6ee351cd664..d9e262f26c1 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -160,7 +160,7 @@ CORBA::Pollable::_unchecked_narrow (
           Pollable_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &Pollable::_tao_class_id
                 )
             )
@@ -178,19 +178,19 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj)
   return obj;
 }
 
-void *CORBA::Pollable::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::Pollable::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, Pollable)::_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)
              )
     {
@@ -335,7 +335,7 @@ CORBA::DIIPollable::_unchecked_narrow (
           DIIPollable_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &DIIPollable::_tao_class_id
                 )
             )
@@ -353,19 +353,19 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
   return obj;
 }
 
-void *CORBA::DIIPollable::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::DIIPollable::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, DIIPollable)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, Pollable)::_tao_class_id)
             )
     {
@@ -379,7 +379,7 @@ void *CORBA::DIIPollable::_tao_QueryInterface (ptr_arith_t type)
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -524,7 +524,7 @@ CORBA::PollableSet::_unchecked_narrow (
           PollableSet_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &PollableSet::_tao_class_id
                 )
             )
@@ -542,19 +542,19 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
   return obj;
 }
 
-void *CORBA::PollableSet::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA::PollableSet::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
   
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::CORBA, PollableSet)::_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/PollableC.h b/TAO/tao/PollableC.h
index fda74bd19fc..3491d3dc5e0 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -191,7 +191,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);
@@ -278,7 +278,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);
@@ -464,7 +464,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/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 9a4d391b014..74e60727435 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -165,7 +165,7 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
           Interceptor_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &Interceptor::_tao_class_id
                 )
             )
@@ -183,19 +183,19 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_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)
              )
     {
@@ -819,7 +819,7 @@ PortableInterceptor::Current::_unchecked_narrow (
           Current_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &Current::_tao_class_id
                 )
             )
@@ -837,19 +837,19 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::Current::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, 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)
             )
     {
@@ -863,7 +863,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -1055,7 +1055,7 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
           RequestInfo_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &RequestInfo::_tao_class_id
                 )
             )
@@ -1073,19 +1073,19 @@ PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_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)
              )
     {
@@ -1279,7 +1279,7 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
           ClientRequestInfo_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ClientRequestInfo::_tao_class_id
                 )
             )
@@ -1297,19 +1297,19 @@ PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
             )
     {
@@ -1323,7 +1323,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -1521,7 +1521,7 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
           ServerRequestInfo_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ServerRequestInfo::_tao_class_id
                 )
             )
@@ -1539,19 +1539,19 @@ PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
             )
     {
@@ -1565,7 +1565,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -1763,7 +1763,7 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
           ClientRequestInterceptor_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ClientRequestInterceptor::_tao_class_id
                 )
             )
@@ -1781,19 +1781,19 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep
   return obj;
 }
 
-void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
             )
     {
@@ -1807,7 +1807,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -2009,7 +2009,7 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
           ServerRequestInterceptor_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ServerRequestInterceptor::_tao_class_id
                 )
             )
@@ -2027,19 +2027,19 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep
   return obj;
 }
 
-void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
             )
     {
@@ -2053,7 +2053,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -2255,7 +2255,7 @@ PortableInterceptor::IORInfo::_unchecked_narrow (
           IORInfo_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &IORInfo::_tao_class_id
                 )
             )
@@ -2273,19 +2273,19 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_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)
              )
     {
@@ -2477,7 +2477,7 @@ PortableInterceptor::IORInterceptor::_unchecked_narrow (
           IORInterceptor_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &IORInterceptor::_tao_class_id
                 )
             )
@@ -2495,19 +2495,19 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id)
             )
     {
       retv = ACE_reinterpret_cast (void*, this);
     }
   else if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
             )
     {
@@ -2521,7 +2521,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type
           );
     }
   else if (type == ACE_reinterpret_cast (
-               ptr_arith_t,
+               ptrdiff_t,
                &CORBA::Object::_tao_class_id)
              )
     {
@@ -2717,7 +2717,7 @@ PortableInterceptor::PolicyFactory::_unchecked_narrow (
           PolicyFactory_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &PolicyFactory::_tao_class_id
                 )
             )
@@ -2747,19 +2747,19 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
                     CORBA::Policy::_nil ());
 }
 
-void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_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)
              )
     {
@@ -2955,7 +2955,7 @@ PortableInterceptor::ORBInitInfo::_unchecked_narrow (
           ORBInitInfo_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ORBInitInfo::_tao_class_id
                 )
             )
@@ -2973,19 +2973,19 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_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)
              )
     {
@@ -3514,7 +3514,7 @@ PortableInterceptor::ORBInitializer::_unchecked_narrow (
           ORBInitializer_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &ORBInitializer::_tao_class_id
                 )
             )
@@ -3532,19 +3532,19 @@ PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
   return obj;
 }
 
-void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type)
+void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_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/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 7240194f90b..dab30212561 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -158,7 +158,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -438,7 +438,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -674,7 +674,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -861,7 +861,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -1070,7 +1070,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -1220,7 +1220,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -1371,7 +1371,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -1548,7 +1548,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -1686,7 +1686,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -1802,7 +1802,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -2123,7 +2123,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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);
@@ -2237,7 +2237,7 @@ TAO_NAMESPACE  PortableInterceptor
     // 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/TAOC.cpp b/TAO/tao/TAOC.cpp
index 407fb3fd21e..bdbab4c8055 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -341,7 +341,7 @@ TAO::BufferingConstraintPolicy::_unchecked_narrow (
           BufferingConstraintPolicy_ptr,
           obj->_tao_QueryInterface (
               ACE_reinterpret_cast (
-                  ptr_arith_t,
+                  ptrdiff_t,
                   &BufferingConstraintPolicy::_tao_class_id
                 )
             )
@@ -359,19 +359,19 @@ TAO::BufferingConstraintPolicy::_duplicate (BufferingConstraintPolicy_ptr obj)
   return obj;
 }
 
-void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptr_arith_t type)
+void *TAO::BufferingConstraintPolicy::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
 
   if (type == ACE_reinterpret_cast (
-              ptr_arith_t,
+              ptrdiff_t,
               &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_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)
             )
     {
@@ -385,7 +385,7 @@ void *TAO::BufferingConstraintPolicy::_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/TAOC.h b/TAO/tao/TAOC.h
index b99122161f4..9d99aaceb9f 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -217,7 +217,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/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 030d3a79168..18825b250bb 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -200,7 +200,7 @@ public:
   void is_dsi (void);
 
   /// Set the member.
-  void dsi_nvlist_align (ptr_arith_t alignment);
+  void dsi_nvlist_align (ptrdiff_t alignment);
 
   /// Get/Set operations for the argument_flag
   void argument_flag (CORBA::Boolean flag);
@@ -279,7 +279,7 @@ private:
   CORBA::Boolean is_dsi_;
 
   /// Used to pad CDR stream if we have used DSI.
-  ptr_arith_t dsi_nvlist_align_;
+  ptrdiff_t dsi_nvlist_align_;
 
   /**
    * An argument flag to indicate whether there is any data that is
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 2b3dee08baa..d399dc5f17e 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -172,7 +172,7 @@ TAO_ServerRequest::is_dsi (void)
 }
 
 ACE_INLINE void
-TAO_ServerRequest::dsi_nvlist_align (ptr_arith_t alignment)
+TAO_ServerRequest::dsi_nvlist_align (ptrdiff_t alignment)
 {
   this->dsi_nvlist_align_ = alignment;
 }
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
index 5cf3f9b9d20..b575025d1a4 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/ValueBase.cpp
@@ -85,7 +85,7 @@ CORBA::ValueBase::_tao_any_destructor (void *x)
 CORBA::Boolean
 CORBA::ValueBase::_tao_marshal (TAO_OutputCDR &strm,
                                 CORBA::ValueBase *this_,
-                                ptr_arith_t /* formal_type_id */)
+                                ptrdiff_t /* formal_type_id */)
 {
   CORBA::Boolean retval = 1;
   // %! yet much to do ... look for +++ !
@@ -360,7 +360,7 @@ operator<< (TAO_OutputCDR &strm,
              strm,
              ACE_const_cast (CORBA::ValueBase *,
                              _tao_valuetype),
-             (ptr_arith_t) &CORBA::ValueBase::_downcast
+             (ptrdiff_t) &CORBA::ValueBase::_downcast
            );
 }
 
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
index f715c79b4dc..a3fc3fad6e7 100644
--- a/TAO/tao/ValueBase.h
+++ b/TAO/tao/ValueBase.h
@@ -25,7 +25,7 @@
 #include "tao/corbafwd.h"
 #include "tao/Pseudo_Value_VarOut_T.h"
 
-#include "ace/Basic_Types.h"           /* for ptr_arith_t */
+#include "ace/Basic_Types.h"           /* for ptrdiff_t */
 #include "ace/Synch_T.h"
 
 
@@ -81,7 +81,7 @@ namespace CORBA
     /// how it is called)
     static CORBA::Boolean _tao_marshal (TAO_OutputCDR &strm,
                                         ValueBase *_this,
-                                        ptr_arith_t formal_type_id = 0);
+                                        ptrdiff_t formal_type_id = 0);
 
     /// Unmarshal a valuetype, if formal type is a pointer to
     /// ValueBase
@@ -102,7 +102,7 @@ namespace CORBA
 
   public:  // otherwise these cannot be called from a static function
 
-    virtual void *_tao_obv_narrow (ptr_arith_t) = 0;
+    virtual void *_tao_obv_narrow (ptrdiff_t) = 0;
 
     /// during marshal jump to the most derived part
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) = 0;