Fixed unresolved exports, more override

    * ACE/protocols/ace/HTBP/HTBP_Addr.cpp:
    * ACE/protocols/ace/HTBP/HTBP_Addr.h:
    * TAO/tao/PortableServer/Active_Object_Map.cpp:
    * TAO/tao/PortableServer/Active_Object_Map.h:
    * TAO/tao/PortableServer/Active_Policy_Strategies.h:
    * TAO/tao/PortableServer/Active_Policy_Strategies.inl:
    * TAO/tao/PortableServer/IdUniquenessStrategy.h:
    * TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp:
    * TAO/tao/PortableServer/Operation_Table_Binary_Search.h:
    * TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h:
    * TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp:
    * TAO/tao/PortableServer/Operation_Table_Linear_Search.h:
    * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp:
    * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h:
    * TAO/tao/PortableServer/POA_Current_Factory.cpp:
    * TAO/tao/PortableServer/POA_Current_Impl.cpp:
    * TAO/tao/PortableServer/POA_Current_Impl.h:
    * TAO/tao/PortableServer/POA_Policy_Set.h:
    * TAO/tao/PortableServer/ServantRetentionStrategy.h:

19 files changed, 58 insertions, 107 deletions

diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp
index fdc13f56090..182fa4f1fbc 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Addr.cpp
+++ b/ACE/protocols/ace/HTBP/HTBP_Addr.cpp
@@ -3,14 +3,8 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Constructor
-ACE::HTBP::Addr::Addr ()
-{
-}
-
 // Creates a ACE_INET_Addr from a PORT_NUMBER and the remote
 // HOST_NAME.
-
 ACE::HTBP::Addr::Addr (u_short port_number,
                        const char host_name[],
                        int address_family)
diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h
index 3484700dc53..21e6ec35303 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Addr.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h
@@ -41,7 +41,7 @@ namespace ACE
     {
     public:
       /// Constructor
-      Addr ();
+      Addr () = default;
 
       Addr (const Addr &other);
 
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 9f626b82f58..1ddf7e457cd 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -377,10 +377,6 @@ TAO_Active_Object_Map::is_user_id_in_map (
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy ()
-{
-}
-
 void
 TAO_Id_Uniqueness_Strategy::set_active_object_map (
   TAO_Active_Object_Map *active_object_map)
@@ -790,10 +786,6 @@ TAO_Multiple_Id_Strategy::remaining_activations (
 }
 #endif
 
-TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy ()
-{
-}
-
 void
 TAO_Lifespan_Strategy::set_active_object_map (
   TAO_Active_Object_Map *active_object_map)
@@ -913,10 +905,6 @@ TAO_Active_Object_Map_Entry *&entry)
 }
 #endif
 
-TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy ()
-{
-}
-
 void
 TAO_Id_Assignment_Strategy::set_active_object_map (
   TAO_Active_Object_Map *active_object_map)
@@ -1071,21 +1059,11 @@ TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy ()
-{
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size)
   : system_id_map_ (map_size)
 {
 }
 
-TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy ()
-{
-}
-
 int
 TAO_Active_Hint_Strategy::recover_key (
   const PortableServer::ObjectId &system_id,
@@ -1135,10 +1113,6 @@ TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
 
 ////////////////////////////////////////////////////////////////////////////////
 
-TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy ()
-{
-}
-
 int
 TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
                                    PortableServer::ObjectId &user_id)
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index b4eb5ef21ea..d9c99565c45 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -277,7 +277,7 @@ class TAO_Id_Uniqueness_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Id_Uniqueness_Strategy ();
+  virtual ~TAO_Id_Uniqueness_Strategy () = default;
 
   /// Must be used with UNIQUE_ID policy.
   virtual int
@@ -432,7 +432,7 @@ class TAO_Lifespan_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Lifespan_Strategy ();
+  virtual ~TAO_Lifespan_Strategy () = default;
 
   /// Can be used with any policy.
   virtual int
@@ -503,7 +503,7 @@ class TAO_Id_Assignment_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Id_Assignment_Strategy ();
+  virtual ~TAO_Id_Assignment_Strategy () = default;
 
   /// Must be used with SYSTEM_ID policy.
   virtual int
@@ -589,7 +589,7 @@ class TAO_Id_Hint_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_Id_Hint_Strategy ();
+  virtual ~TAO_Id_Hint_Strategy () = default;
 
   /// Find the user id from the system id.
   virtual int
@@ -632,7 +632,7 @@ public:
   TAO_Active_Hint_Strategy (CORBA::ULong map_size);
 
   /// Virtual destructor.
-  virtual ~TAO_Active_Hint_Strategy ();
+  virtual ~TAO_Active_Hint_Strategy () = default;
 
   virtual int
   recover_key (const PortableServer::ObjectId &system_id,
@@ -674,7 +674,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy
 {
 public:
   /// Virtual destructor.
-  virtual ~TAO_No_Hint_Strategy ();
+  virtual ~TAO_No_Hint_Strategy () = default;
 
   virtual int
   recover_key (const PortableServer::ObjectId &system_id,
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
index f05fbba535c..9f982b3998e 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -100,7 +100,6 @@ namespace TAO
       Active_Policy_Strategies_Cleanup_Guard () = delete;
       Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p);
       ~Active_Policy_Strategies_Cleanup_Guard ();
-
       Active_Policy_Strategies *_retn ();
 
     private:
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
index 0f1e51fb0eb..78f1b33b63e 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -62,8 +62,7 @@ namespace TAO
     }
 
     ACE_INLINE
-    Active_Policy_Strategies_Cleanup_Guard
-      ::~Active_Policy_Strategies_Cleanup_Guard ()
+    Active_Policy_Strategies_Cleanup_Guard::~Active_Policy_Strategies_Cleanup_Guard ()
     {
       if (this->ptr_)
         {
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
index 7098f64e59e..323356245ea 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -32,9 +32,9 @@ namespace TAO
       IdUniquenessStrategy ();
       virtual ~IdUniquenessStrategy () = default;
 
-      virtual void strategy_init (TAO_Root_POA *poa);
+      virtual void strategy_init (TAO_Root_POA *poa) = 0;
 
-      virtual void strategy_cleanup ();
+      virtual void strategy_cleanup () = 0;
 
       /*
        * Validate if the servant may be activated
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
index a36d050310a..0810f667852 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp
@@ -26,10 +26,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable ()
-{
-}
-
 int
 TAO_Binary_Search_OpTable::find (const char *opname,
                                  TAO_Skeleton &skelfunc,
diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
index 0d45423ff0d..741d3f4da1c 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
@@ -39,20 +39,20 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable
 {
 public:
   /// Do nothing destructor.
-  virtual ~TAO_Binary_Search_OpTable ();
+  ~TAO_Binary_Search_OpTable () override = default;
 
   /// See the documentation in the base class for details.
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Skeleton &skelfunc,
+            const unsigned int length = 0) override;
 
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Collocated_Skeleton &skelfunc,
+            TAO::Collocation_Strategy s,
+            const unsigned int length = 0) override;
 
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr);
+  int bind (const char *opname,
+            const TAO::Operation_Skeletons skel_ptr) override;
 
 private:
   /// Method that should defined by the subclasses. GPERF program
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
index c2c421691f2..9959710c633 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
@@ -49,20 +49,20 @@ public:
                             ACE_Allocator *alloc);
 
   /// Destructor
-  ~TAO_Dynamic_Hash_OpTable ();
+  ~TAO_Dynamic_Hash_OpTable () override;
 
   /// See the documentation in the base class for details.
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr);
+  int bind (const char *opname,
+            const TAO::Operation_Skeletons skel_ptr) override;
 
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Skeleton &skelfunc,
+            const unsigned int length = 0) override;
 
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Collocated_Skeleton &skelfunc,
+            TAO::Collocation_Strategy s,
+            const unsigned int length = 0) override;
 private:
   typedef ACE_Hash_Map_Manager_Ex<const char *,
                                   TAO::Operation_Skeletons,
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
index 4baed2dea0a..d6ff3994156 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp
@@ -27,10 +27,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable ()
-{
-}
-
 int
 TAO_Linear_Search_OpTable::bind (const char *,
                                  const TAO::Operation_Skeletons )
diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
index 4fa853eca8b..75dd2dc7f53 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
@@ -34,20 +34,20 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable
 {
 public:
   /// Destructor.
-  ~TAO_Linear_Search_OpTable ();
+  ~TAO_Linear_Search_OpTable () override = default;
 
   /// See the documentation in the base class for details.
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skel_ptr,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Skeleton &skel_ptr,
+            const unsigned int length = 0) override;
 
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Collocated_Skeleton &skelfunc,
+            TAO::Collocation_Strategy s,
+            const unsigned int length = 0) override;
 
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skelptr);
+  int bind (const char *opname,
+            const TAO::Operation_Skeletons skelptr);
 
 private:
   // = Method that should defined by the subclasses. GPERF program
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index 3156673cb9b..8588dbbe75f 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -25,11 +25,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-// Do nothing destructor.
-TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable ()
-{
-}
-
 int
 TAO_Perfect_Hash_OpTable::find (const char *opname,
                                 TAO_Skeleton &skelfunc,
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
index 76c883f72f4..c44a96f784b 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
@@ -40,28 +40,27 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable
 {
 public:
   /// Do nothing destructor.
-  virtual ~TAO_Perfect_Hash_OpTable ();
+  ~TAO_Perfect_Hash_OpTable () override = default;
 
   /// See the documentation in the base class for details.
-  virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Skeleton &skelfunc,
+            const unsigned int length = 0) override;
 
-  virtual int find (const char *opname,
-                    TAO_Collocated_Skeleton &skelfunc,
-                    TAO::Collocation_Strategy s,
-                    const unsigned int length = 0);
+  int find (const char *opname,
+            TAO_Collocated_Skeleton &skelfunc,
+            TAO::Collocation_Strategy s,
+            const unsigned int length = 0) override;
 
-  virtual int bind (const char *opname,
-                    const TAO::Operation_Skeletons skel_ptr);
+  int bind (const char *opname,
+            const TAO::Operation_Skeletons skel_ptr) override;
 
 private:
   // = Methods that should defined by the subclasses. GPERF program
   //   will generate these routines.
   virtual unsigned int hash (const char *str, unsigned int len) = 0;
 
-  virtual const TAO_operation_db_entry* lookup (const char *str,
-                                                unsigned int len) = 0;
+  virtual const TAO_operation_db_entry* lookup (const char *str, unsigned int len) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp
index 7cad00bf77c..7692b49cdc6 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -9,10 +9,10 @@ TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
                                         int,
                                         ACE_TCHAR * [])
 {
-  TAO::Portable_Server::POA_Current* adapter = 0;
+  TAO::Portable_Server::POA_Current* adapter = nullptr;
   ACE_NEW_RETURN (adapter,
                   TAO::Portable_Server::POA_Current (),
-                  0);
+                  nullptr);
   return adapter;
 }
 
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index 22c8c91e7a6..fb186752fef 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -16,8 +16,7 @@ namespace TAO
   namespace Portable_Server
   {
     POA_Current_Impl::POA_Current_Impl ()
-      : poa_ (0),
-        object_id_ (TAO_POA_OBJECT_ID_BUF_SIZE, 0, object_id_buf_),
+      : object_id_ (TAO_POA_OBJECT_ID_BUF_SIZE, 0, object_id_buf_),
         object_key_ (0),
         servant_ (0),
         priority_ (TAO_INVALID_PRIORITY),
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
index 46fd6c8b9dd..7a9a69e5178 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -144,7 +144,7 @@ namespace TAO
 
     protected:
       /// The POA implementation invoking an upcall
-      ::TAO_Root_POA *poa_;
+      ::TAO_Root_POA *poa_ {};
 
       /// In order to avoid memory allocations, we will populate
       /// the object id with this buffer.
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 8cc73b11ebe..d0d860b7318 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -25,7 +25,7 @@
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Policy_Validator;
-
+//
 class TAO_PortableServer_Export TAO_POA_Policy_Set
 {
 public:
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index 700616953f8..c5882508d99 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -38,9 +38,9 @@ namespace TAO
       ServantRetentionStrategy ();
       virtual ~ServantRetentionStrategy () = default;
 
-      virtual void strategy_init (TAO_Root_POA *poa);
+      virtual void strategy_init (TAO_Root_POA *poa) = 0;
 
-      virtual void strategy_cleanup();
+      virtual void strategy_cleanup() = 0;
 
       virtual CORBA::ULong waiting_servant_deactivation () const = 0;