Fixed selection of BOOST_NO_STDC_NAMESPACE on bcb6

[SVN r13046]
This commit is contained in:
John Maddock
2002-03-03 11:33:14 +00:00
parent 7e7c15a4cc
commit 6018d270bc

View File

@@ -80,10 +80,17 @@
// but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our // but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our
// workaround does not conflict with STLports: // workaround does not conflict with STLports:
// //
//
// Harold Howe says:
// Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with
// BCB6 does cause problems. If we detect BCB6, then don't define
// BOOST_NO_STDC_NAMESPACE
//
#if !defined(__BORLANDC__) || (__BORLANDC__ < 0x560)
# 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
#endif
// //
// std::reverse_iterate behaves like VC6's under some circumstances: // std::reverse_iterate behaves like VC6's under some circumstances:
// //
@@ -117,3 +124,4 @@