Imported Upstream version 1.57.0

[platform/upstream/boost.git] / boost / xpressive / match_results.hpp

diff --git a/boost/xpressive/match_results.hpp b/boost/xpressive/match_results.hpp
index 6e9516d..e7923f8 100644 (file)
--- a/boost/xpressive/match_results.hpp
+++ b/boost/xpressive/match_results.hpp
@@ -16,7 +16,7 @@
 #define BOOST_XPRESSIVE_MATCH_RESULTS_HPP_EAN_10_04_2005
 
 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
 # pragma once
 #endif
 
@@ -119,8 +119,8 @@ struct char_overflow_handler_
 ///////////////////////////////////////////////////////////////////////////////
 // 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 @@ struct case_converting_iterator
     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 @@ struct case_converting_iterator
     case_converting_iterator &operator ++()
     {
         ++this->out_;
-        this->next_ = None;
+        this->next_ = op_none;
         return *this;
     }
 
@@ -162,8 +162,8 @@ struct case_converting_iterator
 
     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 @@ struct case_converting_iterator
     {
         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;
 
@@ -934,7 +934,7 @@ private:
     (
         OutputIterator out
       , Expr const &format
-      , regex_constants::match_flag_type flags
+      , regex_constants::match_flag_type
       , mpl::size_t<4>
     ) const
     {
@@ -1096,11 +1096,12 @@ private:
             case BOOST_XPR_CHAR_(char_type, ':'):
                 if(metacolon)
                 {
+                    BOOST_FALLTHROUGH;
             case BOOST_XPR_CHAR_(char_type, ')'):
                     ++cur;
                     return out;
                 }
-                // else fall-through
+                BOOST_FALLTHROUGH;
 
             default:
                 *out++ = *cur++;
@@ -1250,35 +1251,35 @@ private:
             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');
             }