diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-08-16 16:59:42 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-08-16 16:59:42 +0200 |
commit | ff36cc735a8fc98d840982116021da48c4cb2568 (patch) | |
tree | 89a0a6402b39f0553fd554ec7d0e58ea9504403d /TAO | |
parent | 181e8564c930d8206b8d73af4033813e76e91f9f (diff) | |
download | ATCD-ff36cc735a8fc98d840982116021da48c4cb2568.tar.gz |
Cleanup old Embarcadero compiler checks
* ACE/ace/Compression/rle/RLECompressor.cpp:
* ACE/ace/post.h:
* ACE/ace/pre.h:
* 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:
Diffstat (limited to 'TAO')
4 files changed, 1 insertions, 33 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h index 8554ce38f27..01b42f1706f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h @@ -21,10 +21,6 @@ #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option push -w-8022 -#endif - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -66,10 +62,6 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option pop -#endif - #endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */ #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h index 997bba215eb..0f4ea9ae300 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h @@ -18,10 +18,6 @@ #include "orbsvcs/Notify/Default_Factory.h" -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option push -w-8022 -#endif - TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -33,7 +29,7 @@ class TAO_RT_Notify_Export TAO_Notify_RT_Factory : public TAO_Notify_Default_Fac { public: /// Constructor - TAO_Notify_RT_Factory (void); + TAO_Notify_RT_Factory (); /// Destructor virtual ~TAO_Notify_RT_Factory (); @@ -48,10 +44,6 @@ public: TAO_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option pop -#endif - ACE_FACTORY_DECLARE (TAO_RT_Notify, TAO_Notify_RT_Factory) #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp index 311b9a2eb75..96fe82eb761 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp @@ -10,10 +10,6 @@ #include "DllOrb.h" -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option push -w-8057 -#endif - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE( "testDllOrb", "Bug_3252", @@ -230,7 +226,3 @@ ACE_TMAIN(int, ACE_TCHAR **argv) return 0; } - -#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 fe300ac0ac0..3f2cd268f09 100644 --- a/TAO/tests/Bug_3574_Regression/test.cpp +++ b/TAO/tests/Bug_3574_Regression/test.cpp @@ -1,9 +1,5 @@ #include "tao/StringSeqC.h" -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option push -w-8011 -#endif - int ACE_TMAIN (int, ACE_TCHAR *[]) { @@ -51,7 +47,3 @@ ACE_TMAIN (int, ACE_TCHAR *[]) return 0; } - -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option pop -#endif |