diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-12 12:37:48 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-12 12:37:53 +0100 |
commit | 52909035af5e91e89a8baad3b74828e648628dd3 (patch) | |
tree | 7a7900e86bba2a1f16afd1bdd3b57cc516e4ca97 /external/boost | |
parent | c880eb6b699ffda22231d008e3bcc842db32576f (diff) |
have another stab at fixing the -Wimplicit-fallthrough in json_parser
without triggering a -Wimplicit-fallthrough in unreachable code
Change-Id: I971272ffcf87d7224265a9a3ae87fcf8129c7a7a
Diffstat (limited to 'external/boost')
-rw-r--r-- | external/boost/fallthrough.patch.0 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/external/boost/fallthrough.patch.0 b/external/boost/fallthrough.patch.0 index ed9c83b15bd7..8b0fb1d0a123 100644 --- a/external/boost/fallthrough.patch.0 +++ b/external/boost/fallthrough.patch.0 @@ -34,11 +34,13 @@ case 'i': --- ./boost/property_tree/detail/json_parser/standard_callbacks.hpp +++ ./boost/property_tree/detail/json_parser/standard_callbacks.hpp -@@ -117,6 +117,7 @@ +@@ -116,8 +116,8 @@ + return *stack.back().t; } case object: - assert(false); // must start with string, i.e. call new_value -+ BOOST_FALLTHROUGH; +- assert(false); // must start with string, i.e. call new_value case key: { ++ assert(l.k != object); // must start with string, i.e. call new_value l.t->push_back(std::make_pair(key_buffer, Ptree())); l.k = object; + layer nl = {leaf, &l.t->back().second}; |