[Boost-commit] svn:boost r46346 - trunk/boost/range

From: nesotto_at_[hidden]
Date: 2008-06-12 06:54:44

Author: nesotto
Date: 2008-06-12 06:54:44 EDT (Thu, 12 Jun 2008)
New Revision: 46346
URL: http://svn.boost.org/trac/boost/changeset/46346

Log:
fixes from Trac
Text files modified: 
   trunk/boost/range/as_literal.hpp |     7 ++++++-                                 
   trunk/boost/range/begin.hpp      |     8 ++++----                                
   trunk/boost/range/end.hpp        |     8 ++++----                                
   3 files changed, 14 insertions(+), 9 deletions(-)

Modified: trunk/boost/range/as_literal.hpp
==============================================================================
--- trunk/boost/range/as_literal.hpp	(original)
+++ trunk/boost/range/as_literal.hpp	2008-06-12 06:54:44 EDT (Thu, 12 Jun 2008)
@@ -25,7 +25,9 @@
 #include <boost/detail/workaround.hpp>
 
 #include <cstring>
+#ifndef BOOST_NO_CWCHAR 
 #include <cwchar>
+#endif
 
 namespace boost
 {
@@ -36,10 +38,12 @@
             return strlen( s );
         }
 
+#ifndef BOOST_NO_INTRINSIC_WCHAR_T 
         inline std::size_t length( const wchar_t* s )
         {
             return wcslen( s );
         }
+#endif        
 
         //
         // Remark: the compiler cannot choose between T* and T[sz]
@@ -57,7 +61,7 @@
             return true;
         }
 
-        
+#ifndef BOOST_NO_INTRINSIC_WCHAR_T 
         inline bool is_char_ptr( wchar_t* )
         {
             return true;
@@ -67,6 +71,7 @@
         {
             return true;
         }
+#endif
         
         template< class T >
         inline long is_char_ptr( T /* r */ )

Modified: trunk/boost/range/begin.hpp
==============================================================================
--- trunk/boost/range/begin.hpp	(original)
+++ trunk/boost/range/begin.hpp	2008-06-12 06:54:44 EDT (Thu, 12 Jun 2008)
@@ -73,15 +73,15 @@
     // May this be discarded? Or is it needed for bad compilers?
     //
     template< typename T, std::size_t sz >
-    inline const T* range_begin( const T (&array)[sz] )
+    inline const T* range_begin( const T (&a)[sz] )
     {
-        return array;
+        return a;
     }
 
     template< typename T, std::size_t sz >
-    inline T* range_begin( T (&array)[sz] )
+    inline T* range_begin( T (&a)[sz] )
     {
-        return array;
+        return a;
     }
 
 

Modified: trunk/boost/range/end.hpp
==============================================================================
--- trunk/boost/range/end.hpp	(original)
+++ trunk/boost/range/end.hpp	2008-06-12 06:54:44 EDT (Thu, 12 Jun 2008)
@@ -71,15 +71,15 @@
         //////////////////////////////////////////////////////////////////////
 
         template< typename T, std::size_t sz >
-        inline const T* range_end( const T (&array)[sz] )
+        inline const T* range_end( const T (&a)[sz] )
         {
-            return range_detail::array_end<T,sz>( array );
+            return range_detail::array_end<T,sz>( a );
         }
 
         template< typename T, std::size_t sz >
-        inline T* range_end( T (&array)[sz] )
+        inline T* range_end( T (&a)[sz] )
         {
-            return range_detail::array_end<T,sz>( array );
+            return range_detail::array_end<T,sz>( a );
         }
 
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \