summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-23 14:31:01 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-06-23 13:49:10 +0000
commit45420ef4b06b6039ac09f813c964c1b037a485f1 (patch)
tree22c3f198d58545200a2b26ed53556ae2a4794ec3
parent768c4b4526b1e6340587d72b985005da786a8494 (diff)
Yarr: Add Q_FALLTHROUGH to fallthroughs detected by GCC 7
Change-Id: I99dcca18155eeef1fdaec8d7693a6a415a68b55b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/3rdparty/masm/yarr/YarrParser.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/3rdparty/masm/yarr/YarrParser.h b/src/3rdparty/masm/yarr/YarrParser.h
index 8c5d71b5fe..13ffd3a1d6 100644
--- a/src/3rdparty/masm/yarr/YarrParser.h
+++ b/src/3rdparty/masm/yarr/YarrParser.h
@@ -118,7 +118,7 @@ private:
m_state = AfterCharacterClassHyphen;
return;
}
- // Otherwise just fall through - cached character so treat this as Empty.
+ Q_FALLTHROUGH(); // cached character, so treat this as Empty.
case Empty:
m_character = ch;
@@ -168,6 +168,7 @@ private:
case CachedCharacter:
// Flush the currently cached character, then fall through.
m_delegate.atomCharacterClassAtom(m_character);
+ Q_FALLTHROUGH();
case Empty:
case AfterCharacterClass:
@@ -347,9 +348,8 @@ private:
delegate.atomPatternCharacter('\\');
break;
}
-
- // Fall-through to handle this as an octal escape.
}
+ Q_FALLTHROUGH(); // Handle this as an octal escape.
// Octal escape
case '0':
@@ -656,7 +656,8 @@ private:
}
restoreState(state);
- } // if we did not find a complete quantifer, fall through to the default case.
+ }
+ Q_FALLTHROUGH(); // if we did not find a complete quantifer, fall through to the default case.
default:
m_delegate.atomPatternCharacter(consume());