From 52de514fafe820cd95d22fbe2ab0a8a5ca12f39f Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Tue, 18 Mar 2003 22:34:32 +0000
Subject: [PATCH] Commit Terje's changes

[SVN r17979]
---
 include/boost/lexical_cast.hpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/boost/lexical_cast.hpp b/include/boost/lexical_cast.hpp
index ff295be..b7d6a63 100644
--- a/include/boost/lexical_cast.hpp
+++ b/include/boost/lexical_cast.hpp
@@ -18,7 +18,7 @@
 #include <typeinfo>
 #include <boost/config.hpp>
 #include <boost/limits.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/type_traits/is_pointer.hpp>
 
 #ifdef BOOST_NO_STRINGSTREAM
 #include <strstream>
@@ -28,10 +28,15 @@
 
 #if defined(BOOST_NO_STRINGSTREAM) || \
     defined(BOOST_NO_STD_WSTRING) || \
-    defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    defined(BOOST_NO_STD_LOCALE) || \
+    defined(BOOST_NO_CWCHAR)
 #define DISABLE_WIDE_CHAR_SUPPORT
 #endif
 
+#ifdef BOOST_NO_INTRINSIC_WCHAR_T
+#include <cwchar>
+#endif
+
 namespace boost
 {
     // exception used to indicate runtime lexical_cast failure
@@ -169,6 +174,8 @@ namespace boost
 
             #if defined(BOOST_NO_STRINGSTREAM)
             std::strstream stream;
+            #elif defined(BOOST_NO_STD_LOCALE)
+            std::stringstream stream;
             #else
             std::basic_stringstream<char_type> stream;
             #endif