diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-08-16 18:46:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 18:46:56 +0200 |
| commit | 6193f95eed37e92c91641dd6ea5bf93b3a2c26c2 (patch) | |
| tree | 89a0a6402b39f0553fd554ec7d0e58ea9504403d /ACE/ace | |
| parent | 181e8564c930d8206b8d73af4033813e76e91f9f (diff) | |
| parent | ff36cc735a8fc98d840982116021da48c4cb2568 (diff) | |
| download | ATCD-6193f95eed37e92c91641dd6ea5bf93b3a2c26c2.tar.gz | |
Merge pull request #1653 from jwillemsen/jwi-embarmaster
Cleanup old Embarcadero compiler checks
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/Compression/rle/RLECompressor.cpp | 7 | ||||
| -rw-r--r-- | ACE/ace/post.h | 3 | ||||
| -rw-r--r-- | ACE/ace/pre.h | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp index 27990fb2ca7..0c852ad9784 100644 --- a/ACE/ace/Compression/rle/RLECompressor.cpp +++ b/ACE/ace/Compression/rle/RLECompressor.cpp @@ -1,10 +1,6 @@ #include "RLECompressor.h" #include "ace/OS_NS_string.h" -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x750) -# pragma option push -w-8072 -#endif - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_RLECompressor::ACE_RLECompressor() @@ -136,6 +132,3 @@ 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__ <= 0x750) -# pragma option pop -#endif diff --git a/ACE/ace/post.h b/ACE/ace/post.h index 03741323f39..72d8917adb8 100644 --- a/ACE/ace/post.h +++ b/ACE/ace/post.h @@ -15,9 +15,6 @@ # pragma pack (pop) #elif defined (__BORLANDC__) # pragma option pop -# if (__BORLANDC__ <= 0x750) -# pragma option pop -# endif # pragma nopushoptwarn # pragma nopackwarning #endif diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h index 1c2004c7784..6ffc9362272 100644 --- a/ACE/ace/pre.h +++ b/ACE/ace/pre.h @@ -17,11 +17,6 @@ # 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__ <= 0x750) -// False warning: Function defined with different linkage, reported to -// Embarcadero as QC 117740 -# pragma option push -w-8127 -# endif # pragma nopushoptwarn # pragma nopackwarning #endif |