summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--.clang-format-java-22
2 files changed, 2 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format
index ba0bff311e..2759015822 100644
--- a/.clang-format
+++ b/.clang-format
@@ -14,7 +14,7 @@ AttributeMacros: ['__', 'NO_RETURN']
BinPackArguments: false
BinPackParameters: false
BreakConstructorInitializers: BeforeColon
-BreakBeforeTernaryOperators: false
+BreakBeforeTernaryOperators: true
ColumnLimit: 100
CommentPragmas: NOLINT:.*
ConstructorInitializerAllOnOneLineOrOnePerLine: true
diff --git a/.clang-format-java-2 b/.clang-format-java-2
index 956bdcde6b..84eee46d67 100644
--- a/.clang-format-java-2
+++ b/.clang-format-java-2
@@ -16,7 +16,7 @@ AttributeMacros: ['__', 'NO_RETURN']
BinPackArguments: false
BinPackParameters: false
BreakConstructorInitializers: BeforeColon
-BreakBeforeTernaryOperators: false
+BreakBeforeTernaryOperators: true
ColumnLimit: 100
CommentPragmas: NOLINT:.*
ConstructorInitializerAllOnOneLineOrOnePerLine: true