Cleanup Embarcadero C++ Builder support

    * ACE/ace/Compression/rle/RLECompressor.cpp:
    * ACE/ace/config-win32-borland.h:
    * ACE/ace/post.h:
    * ACE/ace/pre.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:
    * TAO/tests/RTCORBA/README:

10 files changed, 13 insertions, 39 deletions

diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp
index cbed31d58f1..8e83df4dcfc 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__ <= 0x750)
+#if defined (__BORLANDC__) && (__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__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 # pragma option pop
 #endif
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index e23007815ce..10856fbf747 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -131,10 +131,8 @@
 #if (__BORLANDC__ <= 0x750)
 # define ACE_LACKS_ISWCTYPE
 # define ACE_LACKS_ISCTYPE
-#endif
-
-#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x750)
 # define ACE_LACKS_STRTOK_R
+# define ACE_LACKS_ASCTIME_R
 #endif
 
 #if (__BORLANDC__ <= 0x740)
@@ -142,10 +140,6 @@
 # define ACE_LACKS_GMTIME_R
 #endif
 
-#if (__BORLANDC__ <= 0x750)
-# define ACE_LACKS_ASCTIME_R
-#endif
-
 #define ACE_WCSDUP_EQUIVALENT ::_wcsdup
 #define ACE_STRCASECMP_EQUIVALENT ::stricmp
 #define ACE_STRNCASECMP_EQUIVALENT ::strnicmp
diff --git a/ACE/ace/post.h b/ACE/ace/post.h
index 67049ff8354..03741323f39 100644
--- a/ACE/ace/post.h
+++ b/ACE/ace/post.h
@@ -15,7 +15,7 @@
 # pragma pack (pop)
 #elif defined (__BORLANDC__)
 # pragma option pop
-# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+# if (__BORLANDC__ <= 0x750)
 #  pragma option pop
 # endif
 # pragma nopushoptwarn
diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h
index 0b5f37caa16..1c2004c7784 100644
--- a/ACE/ace/pre.h
+++ b/ACE/ace/pre.h
@@ -17,7 +17,7 @@
 # pragma pack (push, 8)
 #elif defined (__BORLANDC__)
 # pragma option push -a8 -b -Ve- -Vx- -w-rvl -w-rch -w-ccc -w-obs -w-aus -w-pia -w-inl -w-sig
-# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+# if (__BORLANDC__ <= 0x750)
 // False warning: Function defined with different linkage, reported to
 // Embarcadero as QC 117740
 #  pragma option push -w-8127
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
index c5c6d1097c4..c088f39ac8b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -340,23 +340,6 @@ TAO_Port_Utils<T>::create_entry (const char *id,
   return T::_narrow (obj.in ());
 }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
-// Borland gives warnings about argument not used on the construct as used
-// for the other compilers. This has been reported to Borland, adding
-// a workaround to suppress these warnings so that the real important ones
-// are not missed.
-template<typename T>
-void
-TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean is_multiple,
-                                    ACE_Configuration * config,
-                                    ACE_Configuration_Section_Key &key)
-{
-  ACE_UNUSED_ARG (is_multiple);
-  ACE_UNUSED_ARG (config);
-  ACE_UNUSED_ARG (key);
-  // Do nothing for everything except UsesDef.
-}
-#else
 template<typename T>
 void
 TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */,
@@ -365,7 +348,6 @@ TAO_Port_Utils<T>::set_is_multiple (CORBA::Boolean /* is_multiple */,
 {
   // Do nothing for everything except UsesDef.
 }
-#endif
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
index f27157372ac..8554ce38f27 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
@@ -21,7 +21,7 @@
 
 #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 #  pragma option push -w-8022
 #endif
 
@@ -66,7 +66,7 @@ public:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 # pragma option pop
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index 8e47d1fb080..997bba215eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -18,7 +18,7 @@
 
 #include "orbsvcs/Notify/Default_Factory.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 #  pragma option push -w-8022
 #endif
 
@@ -48,7 +48,7 @@ public:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 # pragma option pop
 #endif
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 7c80f15b44c..311b9a2eb75 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -10,7 +10,7 @@
 
 #include "DllOrb.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 #  pragma option push -w-8057
 #endif
 
@@ -231,6 +231,6 @@ ACE_TMAIN(int, ACE_TCHAR **argv)
   return 0;
 }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 # pragma option pop
 #endif
diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp
index acbbf98b012..fe300ac0ac0 100644
--- a/TAO/tests/Bug_3574_Regression/test.cpp
+++ b/TAO/tests/Bug_3574_Regression/test.cpp
@@ -1,6 +1,6 @@
 #include "tao/StringSeqC.h"
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 #  pragma option push -w-8011
 #endif
 
@@ -52,6 +52,6 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   return 0;
 }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750)
 # pragma option pop
 #endif
diff --git a/TAO/tests/RTCORBA/README b/TAO/tests/RTCORBA/README
index dc496d58cab..f809b74a71e 100644
--- a/TAO/tests/RTCORBA/README
+++ b/TAO/tests/RTCORBA/README
@@ -1,5 +1,3 @@
-
-
 This directory houses a collection of tests which exercise TAO support
 for features defined in the RT-CORBA specification. Tests which exercise
 TAO-specific RT features can be found in $TAO_ROOT/performance-tests/RTCorba.