diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 09:16:03 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-29 09:16:03 +0100 |
commit | 1d1caa2f5340920a93898f9e34cd1c5477400320 (patch) | |
tree | e15c34bf9476ee1687965b1eccd78bc316223813 /TAO/tao/PortableServer/Regular_POA.cpp | |
parent | 76c3b5473a9d0aa75e8f36522eff1a1307f89cf2 (diff) | |
parent | daabeb9bb2388926f610f93c987563ce596e091f (diff) | |
download | ATCD-1d1caa2f5340920a93898f9e34cd1c5477400320.tar.gz |
Merge branch 'master' into test-corba-is-nil
Diffstat (limited to 'TAO/tao/PortableServer/Regular_POA.cpp')
-rw-r--r-- | TAO/tao/PortableServer/Regular_POA.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index fad1bcc1272..d95abb8b3ca 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -30,12 +30,12 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, { } -TAO_Regular_POA::~TAO_Regular_POA (void) +TAO_Regular_POA::~TAO_Regular_POA () { } void -TAO_Regular_POA::remove_from_parent_i (void) +TAO_Regular_POA::remove_from_parent_i () { // Remove POA from the parent if (this->parent_ != 0) @@ -49,13 +49,13 @@ TAO_Regular_POA::remove_from_parent_i (void) } CORBA::Boolean -TAO_Regular_POA::root (void) const +TAO_Regular_POA::root () const { return (parent_ == 0); } char -TAO_Regular_POA::root_key_type (void) +TAO_Regular_POA::root_key_type () { if (this->parent_ != 0) { |