[Boost-commit] svn:boost r54221 - in trunk/boost/wave: . util

Subject: [Boost-commit] svn:boost r54221 - in trunk/boost/wave: . util
From: hartmut.kaiser_at_[hidden]
Date: 2009-06-22 15:44:49

Author: hkaiser
Date: 2009-06-22 15:44:48 EDT (Mon, 22 Jun 2009)
New Revision: 54221
URL: http://svn.boost.org/trac/boost/changeset/54221

Log:
Wave: fixed gcc 4.4 compilation problems
Text files modified: 
   trunk/boost/wave/util/flex_string.hpp |     5 ++---                                   
   trunk/boost/wave/wave_config.hpp      |     1 +                                       
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/wave/util/flex_string.hpp
==============================================================================
--- trunk/boost/wave/util/flex_string.hpp	(original)
+++ trunk/boost/wave/util/flex_string.hpp	2009-06-22 15:44:48 EDT (Mon, 22 Jun 2009)
@@ -1651,7 +1651,6 @@
 #ifndef NDEBUG
         Invariant checker(*this); 
 #endif
-        static std::less_equal<const value_type*> le;
         if (IsAliasedRange(s, s + n))
         {
             const size_type offset = s - &*begin();
@@ -1853,7 +1852,7 @@
         InputIterator b, InputIterator e, Selector<0>)
     { 
         InsertImpl(i, b, e, 
-            std::iterator_traits<InputIterator>::iterator_category());
+            typename std::iterator_traits<InputIterator>::iterator_category());
         return *this;
     }
 
@@ -2039,7 +2038,7 @@
         InputIterator b, InputIterator e, Selector<0>)
     { 
         ReplaceImpl(i1, i2, b, e, 
-            std::iterator_traits<InputIterator>::iterator_category());
+            typename std::iterator_traits<InputIterator>::iterator_category());
         return *this;
     }
 

Modified: trunk/boost/wave/wave_config.hpp
==============================================================================
--- trunk/boost/wave/wave_config.hpp	(original)
+++ trunk/boost/wave/wave_config.hpp	2009-06-22 15:44:48 EDT (Mon, 22 Jun 2009)
@@ -196,6 +196,7 @@
     defined(BOOST_WAVE_STRINGTYPE_USE_STDSTRING) 
 
 #define BOOST_WAVE_STRINGTYPE std::string
+
 #if !defined(BOOST_WAVE_STRINGTYPE_USE_STDSTRING)
 #define BOOST_WAVE_STRINGTYPE_USE_STDSTRING 1
 #endif