diff options
author | Dan Willemsen <dwillemsen@google.com> | 2018-10-09 20:01:51 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2018-10-09 20:01:51 -0700 |
commit | 4ac13f512a8a9b71ecca47adf8bd5b3cc6d1c505 (patch) | |
tree | 3bd9428a3fffac3ec51c8696012a44169e77f7bc /ninja.cc | |
parent | bb306940b75976fb2563fa74386102599f325df4 (diff) | |
parent | 5b4c39fdfe2fc2e457e92ab997520c2d3836ff99 (diff) | |
download | kati-4ac13f512a8a9b71ecca47adf8bd5b3cc6d1c505.tar.gz |
Merge remote-tracking branch 'aosp/upstream'android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release
* aosp/upstream:
Mark fallthrough cases with [[clang::fallthrough]]
Test: treehugger
Change-Id: I3e9cac7a16e992e970719f98fd65ed4c0b6e18d8
Diffstat (limited to 'ninja.cc')
-rw-r--r-- | ninja.cc | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -530,7 +530,9 @@ class NinjaGenerator { case ':': case ' ': r += '$'; - // fall through. +#if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) + [[clang::fallthrough]]; +#endif default: r += c; } |