summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tom Cherry <tomcherry@google.com> 2019-07-10 15:04:04 -0700
committer Tom Cherry <tomcherry@google.com> 2019-07-10 15:04:04 -0700
commit0dd3ab5387083abf8ddab5af863c9845dc049169 (patch)
tree3c0eb0e5b2bd873625e64d1afbe32f3e1f2ffb06
parentdb7a770509f9eb570828a65ad0f8a3887c64fd45 (diff)
system-clang-format: Add Standard: Cpp11
clang-format tries to automatically detect the Cpp standard used, particularly when determining to put spaces in template definitions: Cpp03: std::vector<std::pair<bool, bool> > vs Cpp11: std::vector<std::pair<bool, bool>> It doesn't always get this correct as seen in https://android-review.googlesource.com/c/platform/system/core/+/973463/8 but since we know that all code within Android is C++17, we can safely assume it should be formatted with the newer standard. Test: clang-format doesn't break the above change. Change-Id: I7d1d709690b7bca6da3863cc9a58e53eaec751b0
-rw-r--r--scripts/system-clang-format1
-rw-r--r--scripts/system-clang-format-21
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/system-clang-format b/scripts/system-clang-format
index 14abd934b..a7614d29f 100644
--- a/scripts/system-clang-format
+++ b/scripts/system-clang-format
@@ -1,4 +1,5 @@
BasedOnStyle: Google
+Standard: Cpp11
AccessModifierOffset: -2
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
diff --git a/scripts/system-clang-format-2 b/scripts/system-clang-format-2
index e28b379c4..a4e23f860 100644
--- a/scripts/system-clang-format-2
+++ b/scripts/system-clang-format-2
@@ -1,4 +1,5 @@
BasedOnStyle: Google
+Standard: Cpp11
AllowShortFunctionsOnASingleLine: Inline
ColumnLimit: 100
CommentPragmas: NOLINT:.*