diff options
Diffstat (limited to 'TAO/tao/Valuetype/AbstractBase.inl')
| -rw-r--r-- | TAO/tao/Valuetype/AbstractBase.inl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl index e078a365a89..9e4329c0358 100644 --- a/TAO/tao/Valuetype/AbstractBase.inl +++ b/TAO/tao/Valuetype/AbstractBase.inl @@ -17,9 +17,9 @@ CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj) ACE_INLINE CORBA::AbstractBase_ptr -CORBA::AbstractBase::_nil (void) +CORBA::AbstractBase::_nil () { - return static_cast <CORBA::AbstractBase_ptr> (0); + return nullptr; } ACE_INLINE CORBA::AbstractBase_ptr @@ -30,14 +30,14 @@ CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj) ACE_INLINE CORBA::Boolean -CORBA::AbstractBase::_is_objref (void) const +CORBA::AbstractBase::_is_objref () const { return this->is_objref_; } ACE_INLINE TAO_Stub * -CORBA::AbstractBase::_stubobj (void) const +CORBA::AbstractBase::_stubobj () const { if (this->is_objref_) { @@ -51,27 +51,27 @@ CORBA::AbstractBase::_stubobj (void) const ACE_INLINE CORBA::Boolean -CORBA::AbstractBase::_is_collocated (void) const +CORBA::AbstractBase::_is_collocated () const { return this->is_collocated_; } ACE_INLINE TAO_Abstract_ServantBase * -CORBA::AbstractBase::_servant (void) const +CORBA::AbstractBase::_servant () const { return this->servant_; } ACE_INLINE CORBA::Object_ptr -CORBA::AbstractBase::equivalent_objref (void) +CORBA::AbstractBase::equivalent_objref () { return this->equivalent_obj_.in (); } ACE_INLINE void -CORBA::AbstractBase::_decr_refcount (void) +CORBA::AbstractBase::_decr_refcount () { this->_remove_ref (); } |