diff options
author | MÃ¥rten Kongstad <marten.kongstad@sony.com> | 2018-10-18 14:50:15 +0200 |
---|---|---|
committer | Todd Kennedy <toddke@google.com> | 2018-11-12 13:07:08 -0800 |
commit | e0930d324c9c35546d6940e0ddc8f3e0bd850614 (patch) | |
tree | 53d67221fec06166760f83ca30faaf86cc6c313a /libs/androidfw/Locale.cpp | |
parent | b4c2dc0c1fc09acabfffa1f239e8fa48c75aecae (diff) |
libandroidfw: add FALLTHROUGH_INTENDED to silence warnings
Add FALLTHROUGH_INTENDED to silence compiler warnings such as the
following:
-------- 8< --------
[ 42% 27/63] //frameworks/base/libs/androidfw:libandroidfw clang++
Locale.cpp
frameworks/base/libs/androidfw/Locale.cpp:166:7: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
case 5:
^
frameworks/base/libs/androidfw/Locale.cpp:166:7: note: insert 'FALLTHROUGH_INTENDED;' to silence this warning
case 5:
^
FALLTHROUGH_INTENDED;
frameworks/base/libs/androidfw/Locale.cpp:166:7: note: insert 'break;' to avoid fall-through
case 5:
^
break;
1 warning generated.
-------- >8 --------
Test: 'make libandroidfw' builds with no compiler warnings
Change-Id: I6bc67f2c072f88c9f1a92b7378a6f1a460db70b4
Diffstat (limited to 'libs/androidfw/Locale.cpp')
-rw-r--r-- | libs/androidfw/Locale.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/androidfw/Locale.cpp b/libs/androidfw/Locale.cpp index 2870066ccbba..3eedda88fdce 100644 --- a/libs/androidfw/Locale.cpp +++ b/libs/androidfw/Locale.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "android-base/macros.h" #include "androidfw/Locale.h" #include "androidfw/Util.h" @@ -162,6 +163,7 @@ bool LocaleValue::InitFromBcp47TagImpl(const StringPiece& bcp47tag, const char s set_script(subtags[1].c_str()); break; } + FALLTHROUGH_INTENDED; case 5: case 6: case 7: |