Add support for Embarcadero C++ Builder 10.4 Sydney

    * ACE/NEWS:
    * ACE/ace/Compression/rle/RLECompressor.cpp:
    * ACE/ace/OS_NS_Thread.cpp:
    * ACE/ace/config-win32-borland.h:
    * ACE/ace/os_include/net/os_if.h:
    * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
    * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h:
    * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h:
    * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
    * TAO/tests/Bug_3574_Regression/test.cpp:

5 files changed, 30 insertions, 6 deletions

diff --git a/ACE/NEWS b/ACE/NEWS
index 5bd0e590a2f..1f2586f1ce9 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,16 @@
 USER VISIBLE CHANGES BETWEEN ACE-6.5.9 and ACE-6.5.10
 =====================================================
 
+. Add support for Embarcadero C++ Builder 10.4 Sydney using the
+  classic compiler. ACE/TAO compile with the new 32/64 bit clang
+  compilers but runtime tests show several runtime problems which
+  makes them not safe to use
+
+. Make a change in the ACE Process Manager to resolve an internal
+  compiler error with Visual Studio 2019 16.5.x compilers
+
+. Android enhancements for if_nameindex
+
 USER VISIBLE CHANGES BETWEEN ACE-6.5.8 and ACE-6.5.9
 ====================================================
 
diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp
index 43d48e844b9..cbed31d58f1 100644
--- a/ACE/ace/Compression/rle/RLECompressor.cpp
+++ b/ACE/ace/Compression/rle/RLECompressor.cpp
@@ -1,7 +1,7 @@
 #include "RLECompressor.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x740)
+#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
 #  pragma option push -w-8072
 #endif
 
@@ -140,6 +140,6 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M
 // Close versioned namespace, if enabled by the user.
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x740)
+#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
 # pragma option pop
 #endif
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 4f1b8b08a69..749b4814cb7 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -27,7 +27,6 @@ ACE_MUTEX_LOCK_CLEANUP_ADAPTER_NAME (void *args)
   ACE_VERSIONED_NAMESPACE_NAME::ACE_OS::mutex_lock_cleanup (args);
 }
 
-
 #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400)
 # define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \
        (*THR_ID = ::_beginthreadex ((void(_Optlink*)(void*))ENTRY_POINT, STACK, STACKSIZE, ARGS), *THR_ID)
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index ea0f0d75446..c5a480d8536 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -145,18 +145,21 @@
 # endif /* !__MT__ */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-#if (__BORLANDC__ <= 0x740)
+#if (__BORLANDC__ <= 0x750)
 # define ACE_LACKS_ISWCTYPE
 # define ACE_LACKS_ISCTYPE
 #endif
 
-#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x740)
+#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x750)
 # define ACE_LACKS_STRTOK_R
 #endif
 
 #if (__BORLANDC__ <= 0x740)
 # define ACE_LACKS_LOCALTIME_R
 # define ACE_LACKS_GMTIME_R
+#endif
+
+#if (__BORLANDC__ <= 0x750)
 # define ACE_LACKS_ASCTIME_R
 #endif
 
@@ -190,6 +193,18 @@
 # define ACE_HAS_BUILTIN_BSWAP32
 # define ACE_HAS_BUILTIN_BSWAP64
 # define ACE_LACKS_INLINE_ASSEMBLY
+# if __cplusplus >= 201103L
+#  define ACE_HAS_CPP11
+# endif
+# if __cplusplus >= 201402L
+#  define ACE_HAS_CPP14
+# endif
+# if __cplusplus >= 201703L
+#  define ACE_HAS_CPP17
+# endif
+# if __cplusplus >= 202002L
+#  define ACE_HAS_CPP20
+# endif
 #endif /* __clang__ */
 
 
diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h
index f02af7b5ef8..be467aa2b24 100644
--- a/ACE/ace/os_include/net/os_if.h
+++ b/ACE/ace/os_include/net/os_if.h
@@ -103,7 +103,7 @@ struct  ifconf {
 #endif /* IFF_BROADCAST */
 
 #if defined (ACE_LACKS_STRUCT_IF_NAMEINDEX)
-struct if_nameindex {};
+struct if_nameindex { int dummy; };
 #endif
 
 #ifdef __cplusplus