diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-21 15:51:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 15:51:42 +0200 |
| commit | 2063860a36b5b235cf681b74e8c3ef4909e2032d (patch) | |
| tree | 4a221edeb7ae1c05e6b6be6088c5c557b665ec31 /ACE | |
| parent | eff39881ad44d5fdc79bbc5adbf57b2ca822a034 (diff) | |
| parent | 40feeb36f0b550019f2830238d64a521675ea8c4 (diff) | |
| download | ATCD-2063860a36b5b235cf681b74e8c3ef4909e2032d.tar.gz | |
Merge pull request #1566 from jwillemsen/jwi-bcc32fix-ace6tao2
[ace6] Updated bcc32 version check
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/post.h | 2 | ||||
| -rw-r--r-- | ACE/ace/pre.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/post.h b/ACE/ace/post.h index bea9b56ef59..67049ff8354 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__ <= 0x730) +# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) # pragma option pop # endif # pragma nopushoptwarn diff --git a/ACE/ace/pre.h b/ACE/ace/pre.h index ccb8c553bd5..0b5f37caa16 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__ <= 0x730) +# if (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x750) // False warning: Function defined with different linkage, reported to // Embarcadero as QC 117740 # pragma option push -w-8127 |