From 40feeb36f0b550019f2830238d64a521675ea8c4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 21 Jun 2021 08:42:22 +0200 Subject: [PATCH] Updated bcc32 version check * ACE/ace/post.h: * ACE/ace/pre.h: --- ACE/ace/post.h | 2 +- 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 bea9b56ef596b..67049ff83548e 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 ccb8c553bd581..0b5f37caa1673 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