diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-10-09 21:26:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-09 21:26:46 -0700 |
| commit | 80e02e57122b92946ec644ee127f85119f9ae7d1 (patch) | |
| tree | 3bd9428a3fffac3ec51c8696012a44169e77f7bc /ninja.cc | |
| parent | fe17169a51bf1f84fa3c5407303bd6afb5519139 (diff) | |
| parent | 4ac13f512a8a9b71ecca47adf8bd5b3cc6d1c505 (diff) | |
| download | kati-80e02e57122b92946ec644ee127f85119f9ae7d1.tar.gz | |
Merge remote-tracking branch 'aosp/upstream'
am: 4ac13f512a
Change-Id: I5e1a6faba8f47544c472a763ddadf39aa420d139
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; } |