Merge topic 'cxx11-clang-format'

4022b286 clang-tidy: blacklist "modernize" checks
2b4c32c9 clang-format: format all code as Cpp11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1191

5 files changed, 12 insertions, 29 deletions

diff --git a/Tests/CompileFeatures/cxx_digit_separators.cpp b/Tests/CompileFeatures/cxx_digit_separators.cpp
index a40ac0a..abcd1c8 100644
--- a/Tests/CompileFeatures/cxx_digit_separators.cpp
+++ b/Tests/CompileFeatures/cxx_digit_separators.cpp
@@ -1,5 +1,6 @@
 
 int someFunc()
 {
-  int one_thousand = 1'000; return one_thousand - 1000;
+  int one_thousand = 1'000;
+  return one_thousand - 1000;
 }
diff --git a/Tests/CompileFeatures/cxx_raw_string_literals.cpp b/Tests/CompileFeatures/cxx_raw_string_literals.cpp
index ea4d231..0f83a7c 100644
--- a/Tests/CompileFeatures/cxx_raw_string_literals.cpp
+++ b/Tests/CompileFeatures/cxx_raw_string_literals.cpp
@@ -1,7 +1,7 @@
 
 void someFunc()
 {
-const char p[] = R"(a\
+  const char p[] = R"(a\
 b
 c)";
 }
diff --git a/Tests/CompileFeatures/cxx_variadic_templates.cpp b/Tests/CompileFeatures/cxx_variadic_templates.cpp
index 3dc2570..6951230 100644
--- a/Tests/CompileFeatures/cxx_variadic_templates.cpp
+++ b/Tests/CompileFeatures/cxx_variadic_templates.cpp
@@ -35,7 +35,7 @@ struct eval
 };
 
 template <template <typename...> class T, typename... U>
-struct eval<T<U...> >
+struct eval<T<U...>>
 {
   enum
   {
@@ -62,11 +62,11 @@ struct D
 
 // Note: This test assumes that a compiler supporting this feature
 // supports static_assert. Add a workaround if that does not hold.
-static_assert(eval<A<> >::Matched, "A Matches");
-static_assert(eval<A<int> >::Matched, "A Matches");
-static_assert(eval<A<int, char> >::Matched, "A Matches");
-static_assert(eval<B<int> >::Matched, "B Matches");
-static_assert(eval<C<int, char> >::Matched, "C Matches");
-static_assert(eval<D<int, char> >::Matched, "D Matches");
-static_assert(eval<D<int, char, bool> >::Matched, "D Matches");
-static_assert(eval<D<int, char, bool, double> >::Matched, "D Matches");
+static_assert(eval<A<>>::Matched, "A Matches");
+static_assert(eval<A<int>>::Matched, "A Matches");
+static_assert(eval<A<int, char>>::Matched, "A Matches");
+static_assert(eval<B<int>>::Matched, "B Matches");
+static_assert(eval<C<int, char>>::Matched, "C Matches");
+static_assert(eval<D<int, char>>::Matched, "D Matches");
+static_assert(eval<D<int, char, bool>>::Matched, "D Matches");
+static_assert(eval<D<int, char, bool, double>>::Matched, "D Matches");
diff --git a/Tests/Cuda/.clang-format b/Tests/Cuda/.clang-format
deleted file mode 100644
index a77589a..0000000
--- a/Tests/Cuda/.clang-format
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# This configuration requires clang-format 3.8 or higher.
-BasedOnStyle: Mozilla
-AlignOperands: false
-AlwaysBreakAfterReturnType: None
-AlwaysBreakAfterDefinitionReturnType: None
-ColumnLimit: 79
-Standard: Cpp11
-...
diff --git a/Tests/CudaOnly/.clang-format b/Tests/CudaOnly/.clang-format
deleted file mode 100644
index a77589a..0000000
--- a/Tests/CudaOnly/.clang-format
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# This configuration requires clang-format 3.8 or higher.
-BasedOnStyle: Mozilla
-AlignOperands: false
-AlwaysBreakAfterReturnType: None
-AlwaysBreakAfterDefinitionReturnType: None
-ColumnLimit: 79
-Standard: Cpp11
-...