Merge pull request #2050 from jwillemsen/jwi-portableserverstrategysimplify

Major cleanup in PortableServer library

1 files changed, 11 insertions, 16 deletions

diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
index 161994e964a..58092432668 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -27,40 +27,35 @@ namespace TAO
 {
   namespace Portable_Server
   {
-    class LifespanStrategyTransient
-      : public LifespanStrategy
+    class LifespanStrategyTransient : public LifespanStrategy
     {
     public:
       LifespanStrategyTransient ();
 
-      virtual void notify_startup ();
+      void notify_startup () override;
 
-      virtual void notify_shutdown ();
+      void notify_shutdown () override;
 
       char key_type () const;
 
-      virtual CORBA::Boolean is_persistent () const;
+      CORBA::Boolean is_persistent () const override;
 
-      CORBA::ULong key_length () const;
+      CORBA::ULong key_length () const override;
 
-      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
+      void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) override;
 
-      virtual
       bool validate (CORBA::Boolean is_persistent,
-                     const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
+                     const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const override;
 
       /// Check the state of the POA.
-      virtual void check_state ();
+      void check_state () override;
 
-      virtual ::PortableServer::LifespanPolicyValue type() const;
+      bool use_imr () const override;
 
-      virtual bool use_imr () const;
-
-      virtual CORBA::Object_ptr imr_key_to_object (const TAO::ObjectKey &key,
-                                                   const char *type_id) const;
+      CORBA::Object_ptr imr_key_to_object (const TAO::ObjectKey &key, const char *type_id) const override;
 
     private:
-      TAO::Portable_Server::Creation_Time creation_time_;
+      TAO::Portable_Server::Creation_Time const creation_time_;
     };
   } /* namespace Portable_Server */
 } /* namespace TAO */