From 716ee59f4081486404adae50f46172a39518e619 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 3 Feb 2023 19:49:42 +0100
Subject: Make destructor default

    * TAO/tao/SystemException.cpp:
    * TAO/tao/SystemException.h:
---
 TAO/tao/SystemException.cpp | 4 ----
 TAO/tao/SystemException.h   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index c4df7669a0d..9fb0157a11f 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -86,10 +86,6 @@ CORBA::SystemException::SystemException (const CORBA::SystemException &src)
 {
 }
 
-CORBA::SystemException::~SystemException ()
-{
-}
-
 CORBA::SystemException &
 CORBA::SystemException::operator= (const CORBA::SystemException &src)
 {
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index 1aeb7636e07..5f5fae29c26 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -92,7 +92,7 @@ namespace CORBA
     SystemException (const SystemException & src);
 
     /// Destructor.
-    virtual ~SystemException ();
+    virtual ~SystemException () = default;
 
     /// Get the minor status.
     ULong minor () const;
-- 
cgit v1.2.1


From 89a05c65fd627673f0bcc260b990257dcf30150c Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 3 Feb 2023 19:49:52 +0100
Subject: Use nullptr

    * ACE/ace/Time_Policy.h:
    * ACE/ace/Time_Policy.inl:
---
 ACE/ace/Time_Policy.h   | 2 +-
 ACE/ace/Time_Policy.inl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h
index b50d0594a4d..41a42eb1c39 100644
--- a/ACE/ace/Time_Policy.h
+++ b/ACE/ace/Time_Policy.h
@@ -108,7 +108,7 @@ class ACE_Dynamic_Time_Policy_Base; // forward decl
 class ACE_Export ACE_Delegating_Time_Policy
 {
 public:
-  ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = 0);
+  ACE_Delegating_Time_Policy (ACE_Dynamic_Time_Policy_Base const * delegate = nullptr);
 
   /// Return the current time according to this policy
   ACE_Time_Value_T<ACE_Delegating_Time_Policy> operator()() const;
diff --git a/ACE/ace/Time_Policy.inl b/ACE/ace/Time_Policy.inl
index f057ed3a0f7..52fe49f1f27 100644
--- a/ACE/ace/Time_Policy.inl
+++ b/ACE/ace/Time_Policy.inl
@@ -76,7 +76,7 @@ ACE_Delegating_Time_Policy::set_gettimeofday (ACE_Time_Value (*)())
 ACE_INLINE void
 ACE_Delegating_Time_Policy::set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate)
 {
-  if (delegate != 0)
+  if (delegate)
     {
       this->delegate_ = delegate;
     }
-- 
cgit v1.2.1