Merge pull request #1605 from jwillemsen/jwi-embcleanup

Cleanup Embarcadero C++ Builder support

6 files changed, 8 insertions, 28 deletions

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.