From 94c26b688e9e90154092417ec70330028b79c75c Mon Sep 17 00:00:00 2001
From: peter klausler <pklausler@nvidia.com>
Date: Mon, 5 Feb 2018 16:08:46 -0800
Subject: [PATCH] [flang] Alphabetize and remove settings that match LLVM
 defaults.

Original-commit: flang-compiler/f18@82b1803f76a0053042a736f508e56c8e62817d4d
---
 flang/.clang-format | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/flang/.clang-format b/flang/.clang-format
index dd809c8..6304c64 100644
--- a/flang/.clang-format
+++ b/flang/.clang-format
@@ -1,20 +1,18 @@
 ---
 # See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 BasedOnStyle: LLVM
-SpacesBeforeTrailingComments: 2
+AlignAfterOpenBracket: DontAlign
 AlignEscapedNewlines: DontAlign
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: true
-ConstructorInitializerIndentWidth: 2
-AlignAfterOpenBracket: DontAlign
-AlignOperands: false
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
+AlignOperands: false
 AlignTrailingComments: false
+ConstructorInitializerIndentWidth: 2
 SpaceAfterTemplateKeyword: false
-BreakBeforeBinaryOperators: None
-BreakBeforeTernaryOperators: true
-ContinuationIndentWidth: 4
+SpacesBeforeTrailingComments: 2
+Standard: Cpp17
 ...
 
 # vim:set filetype=yaml:
-- 
2.7.4