This commit was manufactured by cvs2svn to create tag

'Version_1_26_0'.

[SVN r11842]

include/boost/cast.hpp

@@ -121,7 +121,7 @@ namespace boost
 
 //  numeric_cast  ------------------------------------------------------------//
 
-#if !defined(BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS) || defined(BOOST_SGI_CPP_LIMITS)
+#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
   
     namespace detail
     {
@@ -133,7 +133,7 @@ namespace boost
          template <class T>
          struct limits : std::numeric_limits<T>
          {
-         static inline T min()
+    	   static inline T min()
 # ifndef __GNUC__ // bug workaround courtesy Jens Maurer
              {
                  return std::numeric_limits<T>::min() >= 0
@@ -144,7 +144,7 @@ namespace boost
 # else
                  ;
 # endif
-         };
+	       };
        };
 
 # ifdef __GNUC__ // bug workaround courtesy Jens Maurer
@@ -295,7 +295,7 @@ namespace boost
         typedef std::numeric_limits<Source> arg_traits;
         typedef detail::fixed_numeric_limits<Target> result_traits;
         
-#if !defined(BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS) || defined(BOOST_SGI_CPP_LIMITS)
+#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
         // typedefs that act as compile time assertions
         // (to be replaced by boost compile time assertions
         // as and when they become available and are stable)

include/boost/lexical_cast.hpp

@@ -14,8 +14,8 @@
 
 #include <boost/config.hpp>
 
-// Some sstream implementations are broken for the purposes of lexical cast.
-# if defined(BOOST_NO_STRINGSTREAM)
+// The GNU sstream implementation is broken for the purposes of lexical cast.
+# if defined(BOOST_NO_STRINGSTREAM) || (defined(__GNUC__) && !defined(__STL_USE_NEW_IOSTREAMS) || defined(__APPLE_CC__))
 #  define BOOST_LEXICAL_CAST_USE_STRSTREAM
 # endif
 
@@ -61,11 +61,13 @@ namespace boost
     }
 }
 
-// Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
+// Copyright Kevlin Henney, 2000. All rights reserved.
 //
 // Permission to use, copy, modify, and distribute this software for any
 // purpose is hereby granted without fee, provided that this copyright and
-// permissions notice appear in all copies and derivatives.
+// permissions notice appear in all copies and derivatives, and that no
+// charge may be made for the software and its documentation except to cover
+// cost of distribution.
 //
 // This software is provided "as is" without express or implied warranty.