summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKate Stone <katherine.stone@apple.com>2016-09-06 17:19:00 +0000
committerKate Stone <katherine.stone@apple.com>2016-09-06 17:19:00 +0000
commite5a5104e27e8707bc274ae4d3eb20bbc11b86a84 (patch)
tree7d644afa5d90a25390c5aab15e1f2635181b3f09
parent1c039155009c04f4efc37fd76ad75d1342edfccd (diff)
downloadbcm5719-llvm-e5a5104e27e8707bc274ae4d3eb20bbc11b86a84.tar.gz
bcm5719-llvm-e5a5104e27e8707bc274ae4d3eb20bbc11b86a84.zip
Updated .clang-format rules so bring LLDB in line with LLVM standards.
llvm-svn: 280721
-rw-r--r--lldb/.clang-format8
-rw-r--r--lldb/packages/Python/lldbsuite/.clang-format4
2 files changed, 4 insertions, 8 deletions
diff --git a/lldb/.clang-format b/lldb/.clang-format
index c698dc5d99c..9b3aa8b7213 100644
--- a/lldb/.clang-format
+++ b/lldb/.clang-format
@@ -1,9 +1 @@
BasedOnStyle: LLVM
-IndentWidth: 4
-ColumnLimit: 120
-BreakBeforeBraces: Allman
-AlwaysBreakAfterReturnType: All
-AllowShortFunctionsOnASingleLine: Inline
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-IndentCaseLabels: true
-AccessModifierOffset: -4
diff --git a/lldb/packages/Python/lldbsuite/.clang-format b/lldb/packages/Python/lldbsuite/.clang-format
new file mode 100644
index 00000000000..7de7a512ad7
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/.clang-format
@@ -0,0 +1,4 @@
+DisableFormat: true
+
+# Disabling formatting doesn't implicitly disable include sorting
+SortIncludes: false
OpenPOWER on IntegriCloud