diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-11-16 14:43:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-16 14:43:01 +0100 |
commit | 7ef78f2eb2ee2fbcf1dd8641138ca7969932487a (patch) | |
tree | 18365160a366924746d1329fb9cc5e247890f74a /TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h | |
parent | 411b34270df0c46b051fa1da75da6116c291e856 (diff) | |
parent | 71e4e963553d379b9744e9357267b65a0dec8cde (diff) | |
download | ATCD-7ef78f2eb2ee2fbcf1dd8641138ca7969932487a.tar.gz |
Merge pull request #1734 from jwillemsen/jwi-ftcleanup
Fixed g++ warning, use override/default
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h index ae7868261e6..b57c6786a03 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h @@ -33,7 +33,6 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO @@ -59,9 +58,8 @@ class TAO_FtNaming_Export TAO_FT_Naming_Manager public ACE_Task_Base { public: - /// Constructor. - TAO_FT_Naming_Manager (void); + TAO_FT_Naming_Manager (); void set_replicator (TAO_FT_Naming_Replication_Manager *repl); @@ -340,10 +338,8 @@ private: PortableGroup::Name built_in_balancing_strategy_name_; PortableGroup::Name object_group_property_name_; - }; - TAO_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" |