[Boost-commit] svn:boost r83389 - in branches/release: . boost boost/xpressive

Subject: [Boost-commit] svn:boost r83389 - in branches/release: . boost boost/xpressive
From: eric_at_[hidden]
Date: 2013-03-09 19:36:44

Author: eric_niebler
Date: 2013-03-09 19:36:43 EST (Sat, 09 Mar 2013)
New Revision: 83389
URL: http://svn.boost.org/trac/boost/changeset/83389

Log:
merge [83303] from trunk, fixes #8204
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/xpressive/   (props changed)
Text files modified: 
   branches/release/boost/xpressive/match_results.hpp |    28 ++++++++++++++--------------            
   1 files changed, 14 insertions(+), 14 deletions(-)

Modified: branches/release/boost/xpressive/match_results.hpp
==============================================================================
--- branches/release/boost/xpressive/match_results.hpp	(original)
+++ branches/release/boost/xpressive/match_results.hpp	2013-03-09 19:36:43 EST (Sat, 09 Mar 2013)
@@ -119,8 +119,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // transform_op enum
 //
-enum transform_op { None = 0, Upper = 1, Lower = 2 };
-enum transform_scope { Next = 0, Rest = 1 };
+enum transform_op { op_none = 0, op_upper = 1, op_lower = 2 };
+enum transform_scope { scope_next = 0, scope_rest = 1 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // case_converting_iterator
@@ -132,8 +132,8 @@
     case_converting_iterator(OutputIterator const &out, traits<Char> const *tr)
       : out_(out)
       , traits_(tr)
-      , next_(None)
-      , rest_(None)
+      , next_(op_none)
+      , rest_(op_none)
     {}
 
     OutputIterator base() const
@@ -144,7 +144,7 @@
     case_converting_iterator &operator ++()
     {
         ++this->out_;
-        this->next_ = None;
+        this->next_ = op_none;
         return *this;
     }
 
@@ -162,8 +162,8 @@
 
     friend bool set_transform(case_converting_iterator &iter, transform_op trans, transform_scope scope)
     {
-        BOOST_ASSERT(scope == Next || scope == Rest);
-        if(scope == Next)
+        BOOST_ASSERT(scope == scope_next || scope == scope_rest);
+        if(scope == scope_next)
             iter.next_ = trans;
         else
             iter.rest_ = trans;
@@ -174,11 +174,11 @@
     {
         switch(this->next_ ? this->next_ : this->rest_)
         {
-        case Lower:
+        case op_lower:
             ch = this->traits_->tolower(ch);
             break;
 
-        case Upper:
+        case op_upper:
             ch = this->traits_->toupper(ch);
             break;
 
@@ -1250,35 +1250,35 @@
             break;
 
         case BOOST_XPR_CHAR_(char_type, 'l'):
-            if(!set_transform(out, detail::Lower, detail::Next))
+            if(!set_transform(out, detail::op_lower, detail::scope_next))
             {
                 *out++ = BOOST_XPR_CHAR_(char_type, 'l');
             }
             break;
 
         case BOOST_XPR_CHAR_(char_type, 'L'):
-            if(!set_transform(out, detail::Lower, detail::Rest))
+            if(!set_transform(out, detail::op_lower, detail::scope_rest))
             {
                 *out++ = BOOST_XPR_CHAR_(char_type, 'L');
             }
             break;
 
         case BOOST_XPR_CHAR_(char_type, 'u'):
-            if(!set_transform(out, detail::Upper, detail::Next))
+            if(!set_transform(out, detail::op_upper, detail::scope_next))
             {
                 *out++ = BOOST_XPR_CHAR_(char_type, 'u');
             }
             break;
 
         case BOOST_XPR_CHAR_(char_type, 'U'):
-            if(!set_transform(out, detail::Upper, detail::Rest))
+            if(!set_transform(out, detail::op_upper, detail::scope_rest))
             {
                 *out++ = BOOST_XPR_CHAR_(char_type, 'U');
             }
             break;
 
         case BOOST_XPR_CHAR_(char_type, 'E'):
-            if(!set_transform(out, detail::None, detail::Rest))
+            if(!set_transform(out, detail::op_none, detail::scope_rest))
             {
                 *out++ = BOOST_XPR_CHAR_(char_type, 'E');
             }