summaryrefslogtreecommitdiffstats
path: root/.clang-format
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2014-10-31 16:00:18 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-31 23:00:42 +0000
commit1c79f864bd63b801f822c3ee0ae0d3fcb65b8e4d (patch)
treee85ed26517bea58691ab9e4677d83a03a25063bf /.clang-format
parentef7aaab8ef5dbd2c0538eee5339ae2908717b779 (diff)
downloadchromium_src-1c79f864bd63b801f822c3ee0ae0d3fcb65b8e4d.zip
chromium_src-1c79f864bd63b801f822c3ee0ae0d3fcb65b8e4d.tar.gz
chromium_src-1c79f864bd63b801f822c3ee0ae0d3fcb65b8e4d.tar.bz2
Roll buildtools to pull clang-format.
BUG=428816 NOTRY=true Review URL: https://codereview.chromium.org/696843002 Cr-Commit-Position: refs/heads/master@{#302341}
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format4
1 files changed, 4 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
index 0f21d0b..6fdf1dc 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,8 @@
# Defines the Chromium style for automatic reformatting.
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
BasedOnStyle: Chromium
+# This defaults to 'Auto'. Explicitly set it for a while, so that
+# 'vector<vector<int> >' in existing files gets formatted to
+# 'vector<vector<int>>'. ('Auto' means that clang-format will only use
+# 'int>>' if the file already contains at least one such instance.)
Standard: Cpp11