From b07447aa6e8627dd4908a9a030876dcb6c0d9f9c Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 15 Mar 2005 16:02:01 +0000 Subject: [PATCH] BCB 6.4 still needs option -pc (reported by Pavel Vozenilek) [SVN r27672] --- include/boost/detail/shared_count.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/boost/detail/shared_count.hpp b/include/boost/detail/shared_count.hpp index 7125905..cc50165 100644 --- a/include/boost/detail/shared_count.hpp +++ b/include/boost/detail/shared_count.hpp @@ -58,14 +58,13 @@ void sp_array_destructor_hook(void * px); #endif -// The standard library that comes with Borland C++ 5.5.1 +// The standard library that comes with Borland C++ 5.5.1, 5.6.4 // defines std::exception and its members as having C calling // convention (-pc). When the definition of bad_weak_ptr // is compiled with -ps, the compiler issues an error. -// Hence, the temporary #pragma option -pc below. The version -// check is deliberately conservative. +// Hence, the temporary #pragma option -pc below. -#if defined(__BORLANDC__) && __BORLANDC__ == 0x551 +#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564 # pragma option push -pc #endif @@ -79,7 +78,7 @@ public: } }; -#if defined(__BORLANDC__) && __BORLANDC__ == 0x551 +#if defined(__BORLANDC__) && __BORLANDC__ <= 0x564 # pragma option pop #endif