Merge branch 'master' into jwi-bcc64xunicode

jwillemsen · Jul 26, 2024 · 25b9be3 · 25b9be3
2 parents f00ef44 + e69db0c
commit 25b9be3
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 39 deletions.
diff --git 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
 ====================================================
 

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

diff --git 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
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
@@ -562,7 +562,7 @@ <H4><A NAME="svn">Building and Installing TAO from git</H4>
    <CODE>-type bmake</CODE> for Borland C++ make files.</LI><p/>
    <LI> Build ACE+TAO together in one shot. To do that please issue
   the following commands: <p>
-  <CODE> $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc </CODE> <p>
+  <CODE> $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc -type gnuace </CODE> <p>
    from <CODE>$TAO_ROOT</CODE>. This will generate GNUmakefiles for
   ACE, gperf, and core ACE+TAO libraries. Issuing a
   <CODE>'make'</CODE> from <CODE>$TAO_ROOT </CODE> will build all of