Merge pull request #1652 from jwillemsen/jwi-embar

Updated Embarcadero C++ Compiler checks

8 files changed, 13 insertions, 13 deletions

diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp
index cbed31d58f1..148f5ddc28b 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 #  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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 # pragma option pop
 #endif
diff --git a/ACE/ace/post.h b/ACE/ace/post.h
index 67049ff8354..13f7d2b1986 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 #  pragma option pop
 # endif
 # pragma nopushoptwarn
diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h
index 0b5f37caa16..1ce0832da5d 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 // 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..845e6e62980 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
@@ -340,7 +340,7 @@ TAO_Port_Utils<T>::create_entry (const char *id,
   return T::_narrow (obj.in ());
 }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760)
 // 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
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h
index 67021c98ab8..50ee750f958 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 #  pragma option push -w-8022
 #endif
 
@@ -68,7 +68,7 @@ public:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760)
 # pragma option pop
 #endif
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
index d8e61bda16b..1834a3ce004 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 #  pragma option push -w-8022
 #endif
 
@@ -50,7 +50,7 @@ public:
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750)
+#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x760)
 # 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..6780dab114b 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 #  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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 # pragma option pop
 #endif
diff --git a/TAO/tests/Bug_3574_Regression/test.cpp b/TAO/tests/Bug_3574_Regression/test.cpp
index acbbf98b012..a949254b5ec 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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 #  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__ >= 0x660) && (__BORLANDC__ <= 0x760)
 # pragma option pop
 #endif