Use default

    * TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp:
    * TAO/tao/PortableServer/Default_Acceptor_Filter.cpp:
    * TAO/tao/PortableServer/Default_Acceptor_Filter.h:

3 files changed, 9 insertions, 19 deletions

diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
index 38e3b9a251e..7384025005b 100644
--- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
+++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.cpp
@@ -9,11 +9,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 TAO_Acceptor_Filter*
 TAO_Acceptor_Filter_Factory::create_object (TAO_POA_Manager& )
 {
-  TAO_Acceptor_Filter *filter = 0;
+  TAO_Acceptor_Filter *filter = nullptr;
 
   ACE_NEW_RETURN (filter,
                   TAO_Default_Acceptor_Filter (),
-                  0);
+                  nullptr);
 
   return filter;
 }
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index ec9ae61a7a8..28024ce6c2b 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -6,10 +6,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter ()
-{
-}
-
 int
 TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
                                            TAO_MProfile &mprofile,
@@ -18,14 +14,10 @@ TAO_Default_Acceptor_Filter::fill_profile (const TAO::ObjectKey &object_key,
                                            CORBA::Short priority)
 {
   // Go through all the acceptors.
-  for (TAO_Acceptor** acceptor = acceptors_begin;
-       acceptor != acceptors_end;
-       ++acceptor)
+  for (TAO_Acceptor** acceptor = acceptors_begin; acceptor != acceptors_end; ++acceptor)
     {
       // Ask each acceptor to make a profile.
-      if ((*acceptor)->create_profile (object_key,
-                                       mprofile,
-                                       priority) == -1)
+      if ((*acceptor)->create_profile (object_key, mprofile, priority) == -1)
         return -1;
     }
 
@@ -37,9 +29,7 @@ TAO_Default_Acceptor_Filter::encode_endpoints (TAO_MProfile &mprofile)
 {
   // if -ORBUseSharedProfile is set, there may be multiple endpoints
   // per profile, even without priority.
-  for (CORBA::ULong i = 0;
-       i < mprofile.profile_count ();
-       ++i)
+  for (CORBA::ULong i = 0; i < mprofile.profile_count (); ++i)
     {
       TAO_Profile *profile = mprofile.get_profile (i);
       if (profile->encode_alternate_endpoints () == -1)
diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
index c440b985c5d..0057e403b6a 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -41,18 +41,18 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter
   : public TAO_Acceptor_Filter
 {
 public:
-  TAO_Default_Acceptor_Filter ();
+  TAO_Default_Acceptor_Filter () = default;
 
   /// Populate @a mprofile with all available endpoints.
-  virtual int fill_profile (const TAO::ObjectKey &object_key,
+  int fill_profile (const TAO::ObjectKey &object_key,
                     TAO_MProfile &mprofile,
                     TAO_Acceptor **acceptors_begin,
                     TAO_Acceptor **acceptors_end,
-                    CORBA::Short priority = TAO_INVALID_PRIORITY);
+                    CORBA::Short priority = TAO_INVALID_PRIORITY) override;
 
   /// Encodes the endpoints in the profiles into the TAO_TAG_ENDPOINTS
   /// tag component of profiles.
-  int encode_endpoints (TAO_MProfile &mprofile);
+  int encode_endpoints (TAO_MProfile &mprofile) override;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL