From 6018d270bc305fe928ef9e8f0de8fa9759492850 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sun, 3 Mar 2002 11:33:14 +0000
Subject: [PATCH] Fixed selection of BOOST_NO_STDC_NAMESPACE on bcb6

[SVN r13046]
---
 include/boost/config/stdlib/stlport.hpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/boost/config/stdlib/stlport.hpp b/include/boost/config/stdlib/stlport.hpp
index 6df55b49..cc672aba 100644
--- a/include/boost/config/stdlib/stlport.hpp
+++ b/include/boost/config/stdlib/stlport.hpp
@@ -80,10 +80,17 @@
 // but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our
 // workaround does not conflict with STLports:
 //
-#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
+//
+// 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)
+#     define BOOST_NO_STDC_NAMESPACE
+#  endif
 #endif
-
 //
 // std::reverse_iterate behaves like VC6's under some circumstances:
 //
@@ -117,3 +124,4 @@
 
 
 
+