diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-07-16 13:40:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 13:40:21 +0200 |
| commit | 46ac50d47b02bab9066dd1bf0001dd778a0d8fa9 (patch) | |
| tree | fd05680d086e139b3380c62d25c5dec92cc7aad2 /ACE | |
| parent | 92fa7474dc3e26412db04ca629fd993bdc82de71 (diff) | |
| parent | 5ce13938d56b7ec1967151e45df264eceb150ca1 (diff) | |
| download | ATCD-46ac50d47b02bab9066dd1bf0001dd778a0d8fa9.tar.gz | |
Merge pull request #1605 from jwillemsen/jwi-embcleanup
Cleanup Embarcadero C++ Builder support
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/Compression/rle/RLECompressor.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 8 | ||||
| -rw-r--r-- | ACE/ace/post.h | 2 | ||||
| -rw-r--r-- | ACE/ace/pre.h | 2 |
4 files changed, 5 insertions, 11 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 |