diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-02-25 13:27:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-25 13:27:03 +0100 |
commit | fdf9fe05d6a4499ced8b55b52f179275ce0c90b0 (patch) | |
tree | b63469e57597713738afea9d42ef0e78fcb9d7d4 /TAO/tao/DynamicInterface/Request.inl | |
parent | e4bcaf22324492a0d784890cd9ca86b4a707e68f (diff) | |
parent | ab938af466a77a9992d95da9fc832ff50444255f (diff) | |
download | ATCD-fdf9fe05d6a4499ced8b55b52f179275ce0c90b0.tar.gz |
Merge pull request #1440 from jwillemsen/jw-cleanupvc6
Cleanup for vc6, use nullptr, remove redundant void, layout changes
Diffstat (limited to 'TAO/tao/DynamicInterface/Request.inl')
-rw-r--r-- | TAO/tao/DynamicInterface/Request.inl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index 69bf66a866d..ea1b7f79204 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Request_ptr CORBA::Request::_duplicate (CORBA::Request_ptr x) { - if (x != 0) + if (x) { x->_incr_refcount (); } @@ -13,20 +13,20 @@ CORBA::Request::_duplicate (CORBA::Request_ptr x) } ACE_INLINE CORBA::Request_ptr -CORBA::Request::_nil (void) +CORBA::Request::_nil () { - return 0; + return nullptr; } ACE_INLINE CORBA::Object_ptr -CORBA::Request::target (void) const +CORBA::Request::target () const { return this->target_; } // Return the operation name for the request. ACE_INLINE const CORBA::Char * -CORBA::Request::operation (void) const +CORBA::Request::operation () const { return this->opname_; } |