Fixed support for C++ Builder 5 + STLport.

[SVN r14476]
This commit is contained in:
John Maddock
2002-07-16 11:18:02 +00:00
parent bc1b510b18
commit 224e97fbb6

View File

@ -83,13 +83,17 @@
// //
// Harold Howe says: // Harold Howe says:
// Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with // Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with
// BCB6 does cause problems. If we detect BCB6, then don't define // BCB6 does cause problems. If we detect C++ Builder, then don't define
// BOOST_NO_STDC_NAMESPACE // BOOST_NO_STDC_NAMESPACE
// //
#if !defined(__BORLANDC__) || (__BORLANDC__ < 0x560) #if !defined(__BORLANDC__)
# if defined(__STL_IMPORT_VENDOR_CSTD) || defined(__STL_USE_OWN_NAMESPACE) || defined(_STLP_IMPORT_VENDOR_CSTD) || defined(_STLP_USE_OWN_NAMESPACE) # if defined(__STL_IMPORT_VENDOR_CSTD) || defined(__STL_USE_OWN_NAMESPACE) || defined(_STLP_IMPORT_VENDOR_CSTD) || defined(_STLP_USE_OWN_NAMESPACE)
# define BOOST_NO_STDC_NAMESPACE # define BOOST_NO_STDC_NAMESPACE
# endif # endif
#elif __BORLANDC__ < 0x560
// STLport doesn't import std::abs correctly:
#include <stdlib.h>
namespace std { using ::abs; }
#endif #endif
// //
@ -126,3 +130,4 @@