From d89f6928aa1ecd9da65989a170b2a808206a455a Mon Sep 17 00:00:00 2001 From: Like Ma Date: Sun, 14 Jul 2024 13:13:37 +0800 Subject: [PATCH 1/4] Default Log_Msg_* dtors --- ACE/ace/Log_Msg_Backend.cpp | 9 --------- ACE/ace/Log_Msg_Backend.h | 2 +- ACE/ace/Log_Msg_Callback.cpp | 9 --------- ACE/ace/Log_Msg_Callback.h | 2 +- ACE/ace/Log_Msg_UNIX_Syslog.h | 10 +++++----- ACE/ace/ace.mpc | 2 -- ACE/ace/ace_for_tao.mpc | 2 -- 7 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 ACE/ace/Log_Msg_Backend.cpp delete mode 100644 ACE/ace/Log_Msg_Callback.cpp diff --git a/ACE/ace/Log_Msg_Backend.cpp b/ACE/ace/Log_Msg_Backend.cpp deleted file mode 100644 index 0cdad7eb6d31a..0000000000000 --- a/ACE/ace/Log_Msg_Backend.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "ace/Log_Msg_Backend.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_Log_Msg_Backend::~ACE_Log_Msg_Backend () -{ -} - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Log_Msg_Backend.h b/ACE/ace/Log_Msg_Backend.h index a003f70cb6227..e5bad0c7fd714 100644 --- 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 deleted file mode 100644 index d86575567a8d4..0000000000000 --- a/ACE/ace/Log_Msg_Callback.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "ace/Log_Msg_Callback.h" - -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_Log_Msg_Callback::~ACE_Log_Msg_Callback () -{ -} - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Log_Msg_Callback.h b/ACE/ace/Log_Msg_Callback.h index 812c2c7ecda7d..ded34fac42875 100644 --- 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 index e5be52428bd71..06735daaee6db 100644 --- 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 index a300f062c92b5..191fe0c29fca6 100644 --- 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 index 4c5beeb7dfea6..d04e21ee8f01b 100644 --- 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 From 921463b03033e05743f2d00466e435b9c5bdd717 Mon Sep 17 00:00:00 2001 From: Oliver Kellogg Date: Tue, 16 Jul 2024 07:42:50 +0200 Subject: [PATCH 2/4] TAO/TAO-INSTALL.html : In "Building and Installing TAO from git" mwc.pl TAO_ACE.mwc add missing `-type gnuace`. --- TAO/TAO-INSTALL.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index 1094be6199259..55065bbe897bf 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -562,7 +562,7 @@

Building and Installing TAO from git

-type bmake for Borland C++ make files.

  • Build ACE+TAO together in one shot. To do that please issue the following commands:

    - $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc

    + $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc -type gnuace

    from $TAO_ROOT. This will generate GNUmakefiles for ACE, gperf, and core ACE+TAO libraries. Issuing a 'make' from $TAO_ROOT will build all of From 9565633414a52bc5eb1cf4294a88cb8425e7d366 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 17 Jul 2024 14:00:57 +0200 Subject: [PATCH 3/4] Update NEWS --- ACE/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ACE/NEWS b/ACE/NEWS index cd8f9f417d00f..d46e6cde59433 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -1,6 +1,9 @@ USER VISIBLE CHANGES BETWEEN ACE-8.0.0 and ACE-8.0.1 ==================================================== +. When using the Embarcadero C++ Builder bcc64x compiler now bcc64x is + used as linker instead of ld.lld + USER VISIBLE CHANGES BETWEEN ACE-7.1.4 and ACE-8.0.0 ==================================================== From ae21138946e7b3eaa4e1e16d1c7b57a5e2c52dad Mon Sep 17 00:00:00 2001 From: Ryan Carsten Schmidt Date: Sun, 21 Jul 2024 23:42:57 -0500 Subject: [PATCH 4/4] Fix detection of MacOSX SDKs older than 10.10 --- ACE/ace/config-macosx.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 6a7e6b6d34f13..4b108204953f7 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -12,24 +12,24 @@ #include "config-macosx-elcapitan.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 #include "config-macosx-yosemite.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100900 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 #include "config-macosx-mavericks.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 #include "config-macosx-mountainlion.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100700 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 #include "config-macosx-lion.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100600 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 #include "config-macosx-snowleopard.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100500 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 #include "config-macosx-leopard.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100400 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 #include "config-macosx-tiger.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100300 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1030 #include "config-macosx-panther.h" -#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100200 +#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 #include "config-macosx-jaguar.h" #else -#error Cannot detect MacOSX version +#error Cannot detect MacOSX SDK version #endif #endif // ACE_CONFIG_MACOSX_ALL_H