From b23299b5e7f53f8d0672882de68a2e6436823e40 Mon Sep 17 00:00:00 2001 From: Sascha Zelzer Date: Fri, 14 Jun 2019 22:40:28 +0200 Subject: [PATCH] jsoncpp: Suppress implicit-fallthrough warnings from GCC 7 GCC 7, when compiling with -Wimplicit-fallthrough=1 or higher, issues a warning which can be suppressed using a comment that matches certain regular expressions. The comment change does just that: signal to GCC that the fall through is intentional. Signed-off-by: GetAway Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/212b6fdb726292ac4a34563927971ebadcbf22cb Author: Sascha Zelzer Date: 2019-06-14 (Fri, 14 Jun 2019) ------------------ This commit was generated by Migit --- lib/jsoncpp/jsoncpp.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jsoncpp/jsoncpp.cpp b/lib/jsoncpp/jsoncpp.cpp index 59c98d5f7..54875865e 100644 --- a/lib/jsoncpp/jsoncpp.cpp +++ b/lib/jsoncpp/jsoncpp.cpp @@ -1454,8 +1454,7 @@ bool OurReader::readToken(Token& token) { token.type_ = tokenString; ok = readStringSingleQuote(); break; - } // else continue - /* is a break missing here? or is this correct? */ + } // else fall through case '/': token.type_ = tokenComment; ok = readComment();