From 52909035af5e91e89a8baad3b74828e648628dd3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 12 May 2016 12:37:48 +0100 Subject: have another stab at fixing the -Wimplicit-fallthrough in json_parser without triggering a -Wimplicit-fallthrough in unreachable code Change-Id: I971272ffcf87d7224265a9a3ae87fcf8129c7a7a --- external/boost/fallthrough.patch.0 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'external') 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}; -- cgit v1.2.3