diff options
Diffstat (limited to 'TAO/tao/Object.inl')
| -rw-r--r-- | TAO/tao/Object.inl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl index d6560cab557..156d2348018 100644 --- a/TAO/tao/Object.inl +++ b/TAO/tao/Object.inl @@ -44,9 +44,9 @@ CORBA::Object::_duplicate (CORBA::Object_ptr obj) ACE_INLINE CORBA::Object_ptr -CORBA::Object::_nil (void) +CORBA::Object::_nil () { - return 0; + return nullptr; } ACE_INLINE @@ -57,31 +57,31 @@ CORBA::Object::_narrow (CORBA::Object_ptr obj) } ACE_INLINE CORBA::Boolean -CORBA::Object::is_evaluated (void) const +CORBA::Object::is_evaluated () const { return this->is_evaluated_; } ACE_INLINE TAO_ORB_Core * -CORBA::Object::orb_core (void) const +CORBA::Object::orb_core () const { return this->orb_core_; } ACE_INLINE IOP::IOR * -CORBA::Object::steal_ior (void) +CORBA::Object::steal_ior () { return this->ior_._retn (); } ACE_INLINE const IOP::IOR & -CORBA::Object::ior (void) const +CORBA::Object::ior () const { return this->ior_.in (); } ACE_INLINE void -CORBA::Object::_decr_refcount (void) +CORBA::Object::_decr_refcount () { this->_remove_ref (); } |