diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-11-16 13:05:02 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-11-16 13:05:02 +0100 |
| commit | 71e4e963553d379b9744e9357267b65a0dec8cde (patch) | |
| tree | 18365160a366924746d1329fb9cc5e247890f74a /TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h | |
| parent | 411b34270df0c46b051fa1da75da6116c291e856 (diff) | |
| download | ATCD-71e4e963553d379b9744e9357267b65a0dec8cde.tar.gz | |
Fixed g++ warning, use override/default
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Random.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp:
* TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.h:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h index 0b80de5dd72..98c8d1492f8 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h @@ -34,7 +34,7 @@ class TAO_FTNS_Notifier : public ACE_Event_Handler public: TAO_FTNS_Notifier (TAO_FT_Naming_Server &owner, bool iors); - virtual int handle_exception (ACE_HANDLE ); + int handle_exception (ACE_HANDLE) override; TAO_FT_Naming_Server &owner_; bool iors_; @@ -57,7 +57,7 @@ class TAO_FtNaming_Export TAO_FT_Naming_Server : public TAO_Naming_Server public: friend class TAO_FTNS_Notifier; - TAO_FT_Naming_Server (void); + TAO_FT_Naming_Server (); /// Initialize the Naming Service and Object Group Manager with the command line /// arguments and the ORB. Overrridden from TAO_Naming_Server @@ -138,7 +138,6 @@ public: void update_iors_i (); protected: - enum FT_IOR_Indexes { PEER_ROOT = 1, FT_ROOT, @@ -199,9 +198,7 @@ protected: ACE_Unbounded_Queue<FT_Naming::UpdateInfoSeq*> u_infos_; TAO_SYNCH_MUTEX ior_lock_; TAO_SYNCH_MUTEX info_lock_; - - - }; +}; TAO_END_VERSIONED_NAMESPACE_DECL |