From c4cfaded2eec81fbb4efbcbefb897568a33ca48c Mon Sep 17 00:00:00 2001 From: Philipp Schnattinger Date: Thu, 20 Dec 2018 10:48:04 +0100 Subject: [PATCH] =?UTF-8?q?added=20new=20cl=C3=B6ang=20versions=20and=20cp?= =?UTF-8?q?p11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cfg/.clang-format | 2 +- src/file_format.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/.clang-format b/cfg/.clang-format index 1dedcf4..d2d1700 100644 --- a/cfg/.clang-format +++ b/cfg/.clang-format @@ -46,7 +46,7 @@ SpacesBeforeTrailingComments: 2 SpacesInAngles: false SpacesInCStyleCastParentheses: false SpacesInParentheses: false -Standard: Cpp03 +Standard: Cpp11 TabWidth: 2 UseTab: Never ... diff --git a/src/file_format.py b/src/file_format.py index ef6cba7..86fbaf6 100755 --- a/src/file_format.py +++ b/src/file_format.py @@ -36,7 +36,7 @@ def complete_path(text, state): def find_clang_format(): - versions = ('4.0', '3.9', '3.8') + versions = ('6.0', '5.0', '4.0', '3.9', '3.8') for v in versions: candidate = 'clang-format-' + v if os.system('which ' + candidate + ' > /dev/null') == 0: @@ -71,7 +71,7 @@ def find_clang_format(): print print "Supply the executable for your clang formater:" - user_input = raw_input("[clang-format-3.8]: ") + user_input = raw_input("[clang-format]: ") clang = user_input if user_input != "" else "clang-format-3.8" exec_policy = {'cpp': ' -name "*.h" -or -name "*.hpp" -or -name "*.cpp" | xargs ' + clang + ' -i -style=file', # CPP