Merge pull request #2255 from likema/log-msg-ctors

Default Log_Msg_* dtors
DOCGroup · Jul 25, 2024 · 56e1769 · 56e1769
2 parents 9565633 + d89f692
commit 56e1769
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 29 deletions.
diff --git a/ACE/ace/Log_Msg_Backend.cpp b/ACE/ace/Log_Msg_Backend.cpp
diff --git a/ACE/ace/Log_Msg_Backend.h b/ACE/ace/Log_Msg_Backend.h
@@ -40,7 +40,7 @@ class ACE_Export ACE_Log_Msg_Backend
 {
 public:
   /// No-op virtual destructor.
-  virtual ~ACE_Log_Msg_Backend ();
+  virtual ~ACE_Log_Msg_Backend () = default;
 
   /**
    * Open the back end object. Perform any actions needed to prepare

diff --git a/ACE/ace/Log_Msg_Callback.cpp b/ACE/ace/Log_Msg_Callback.cpp
diff --git a/ACE/ace/Log_Msg_Callback.h b/ACE/ace/Log_Msg_Callback.h
@@ -56,7 +56,7 @@ class ACE_Export ACE_Log_Msg_Callback
   ACE_Log_Msg_Callback () = default;
 
   /// No-op virtual destructor.
-  virtual ~ACE_Log_Msg_Callback ();
+  virtual ~ACE_Log_Msg_Callback () = default;
 
   /// Callback routine.  This is called when we want to log a message.
   /// Since this routine is pure virtual, it must be overwritten by the

diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.h b/ACE/ace/Log_Msg_UNIX_Syslog.h
@@ -38,7 +38,7 @@ class ACE_Export ACE_Log_Msg_UNIX_Syslog : public ACE_Log_Msg_Backend
   ACE_Log_Msg_UNIX_Syslog () = default;
 
   /// Destructor
-  virtual ~ACE_Log_Msg_UNIX_Syslog ();
+  ~ACE_Log_Msg_UNIX_Syslog () override;
 
   /// Open a new event log.
   /**
@@ -48,16 +48,16 @@ class ACE_Export ACE_Log_Msg_UNIX_Syslog : public ACE_Log_Msg_Backend
    *                   it is 0 (no name), the application name as
    *                   returned from ACE_Log_Msg::program_name() is used.
    */
-  virtual int open (const ACE_TCHAR *logger_key);
+  int open (const ACE_TCHAR *logger_key) override;
 
   /// Reset the backend.
-  virtual int reset ();
+  int reset () override;
 
   /// Close the backend completely.
-  virtual int close ();
+  int close () override;
 
   /// This is called when we want to log a message.
-  virtual ssize_t log (ACE_Log_Record &log_record);
+  ssize_t log (ACE_Log_Record &log_record) override;
 
 private:
   /// Convert an ACE_Log_Priority value to the corresponding syslog priority.

diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc
@@ -92,8 +92,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf,
     Log_Category.cpp
     Log_Msg.cpp
     Log_Msg_Android_Logcat.cpp
-    Log_Msg_Backend.cpp
-    Log_Msg_Callback.cpp
     Log_Msg_IPC.cpp
     Log_Msg_NT_Event_Log.cpp
     Log_Msg_UNIX_Syslog.cpp

diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
@@ -69,8 +69,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     Lock.cpp
     Log_Category.cpp
     Log_Msg.cpp
-    Log_Msg_Backend.cpp
-    Log_Msg_Callback.cpp
     Log_Msg_IPC.cpp
     Log_Msg_NT_Event_Log.cpp
     Log_Msg_UNIX_Syslog.cpp