[Boost-commit] svn:boost r84014 - in branches/release: . boost boost/wave boost/wave/util libs libs/wave libs/wave/samples/cpp_tokens/slex

Subject: [Boost-commit] svn:boost r84014 - in branches/release: . boost boost/wave boost/wave/util libs libs/wave libs/wave/samples/cpp_tokens/slex
From: hartmut.kaiser_at_[hidden]
Date: 2013-04-22 13:17:12

Author: hkaiser
Date: 2013-04-22 13:17:10 EDT (Mon, 22 Apr 2013)
New Revision: 84014
URL: http://svn.boost.org/trac/boost/changeset/84014

Log:
Wave: merging from trunk
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/wave/   (props changed)
   branches/release/libs/   (props changed)
   branches/release/libs/wave/   (props changed)
Text files modified: 
   branches/release/boost/wave/util/flex_string.hpp                      |    14 +++++++-------                          
   branches/release/libs/wave/ChangeLog                                  |     4 ++++                                    
   branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp |     2 +-                                      
   3 files changed, 12 insertions(+), 8 deletions(-)

Modified: branches/release/boost/wave/util/flex_string.hpp
==============================================================================
--- branches/release/boost/wave/util/flex_string.hpp	(original)
+++ branches/release/boost/wave/util/flex_string.hpp	2013-04-22 13:17:10 EDT (Mon, 22 Apr 2013)
@@ -139,13 +139,13 @@
         case 0:
             while (b != e)
             {
-                *b = c; ++b;
-        case 7: *b = c; ++b;
-        case 6: *b = c; ++b;
-        case 5: *b = c; ++b;
-        case 4: *b = c; ++b;
-        case 3: *b = c; ++b;
-        case 2: *b = c; ++b;
+                *b = c; ++b; BOOST_FALLTHROUGH;
+        case 7: *b = c; ++b; BOOST_FALLTHROUGH;
+        case 6: *b = c; ++b; BOOST_FALLTHROUGH;
+        case 5: *b = c; ++b; BOOST_FALLTHROUGH;
+        case 4: *b = c; ++b; BOOST_FALLTHROUGH;
+        case 3: *b = c; ++b; BOOST_FALLTHROUGH;
+        case 2: *b = c; ++b; BOOST_FALLTHROUGH;
         case 1: *b = c; ++b;
             }
         }

Modified: branches/release/libs/wave/ChangeLog
==============================================================================
--- branches/release/libs/wave/ChangeLog	(original)
+++ branches/release/libs/wave/ChangeLog	2013-04-22 13:17:10 EDT (Mon, 22 Apr 2013)
@@ -20,6 +20,10 @@
 
 CHANGELOG
 
+Boost V1.54:
+ - Fixed #8478: Make Boost.wave compatible with Clang's -Wimplicit-fallthrough 
+   diagnostic.
+
 Boost V1.53:
  - Fixed a problem with context<>::add_macro_definition which sometimes 
    appended a superfluous T_EOF to the macro replacement list.

Modified: branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp	(original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp	2013-04-22 13:17:10 EDT (Mon, 22 Apr 2013)
@@ -658,7 +658,7 @@
                     case T_EXTSTRINGLIT:
                     case T_EXTRAWSTRINGLIT:
                         id = token_id(id & ~AltTokenType);
-                        // fall through
+                        BOOST_FALLTHROUGH;
 
                     case T_CHARLIT:
                     case T_STRINGLIT: