diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-26 13:28:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-26 13:28:13 (GMT) |
| commit | 1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee (patch) | |
| tree | 80b7a3c55e99e9af8c7ca45dec9ff1a03f2a980a | |
| parent | 9d203c0051bbec48dfbee90940e6faff87a2bdeb (diff) | |
| parent | 68e7250a9facbe7b82cff17af3bf2a831e481f3c (diff) | |
| download | CMake-1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee.zip CMake-1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee.tar.gz CMake-1c8b99ce0b8e3a7a78b029a0cf18dc7256be6aee.tar.bz2 | |
Merge topic 'fix-right-angle-bracket-feature-test'
68e7250a Features: Fix cxx_right_angle_brackets compiler feature test
| -rw-r--r-- | Tests/CompileFeatures/cxx_right_angle_brackets.cpp | 4 | ||||
| -rwxr-xr-x | Utilities/Scripts/clang-format.bash | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Tests/CompileFeatures/cxx_right_angle_brackets.cpp b/Tests/CompileFeatures/cxx_right_angle_brackets.cpp index 8f1b0ee..4d494b5 100644 --- a/Tests/CompileFeatures/cxx_right_angle_brackets.cpp +++ b/Tests/CompileFeatures/cxx_right_angle_brackets.cpp @@ -7,6 +7,8 @@ struct A void someFunc() { - A<A<int> > object; + /* clang-format off */ + A<A<int>> object; + /* clang-format on */ (void)object; } diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash index a7080fc..ad3b3a1 100755 --- a/Utilities/Scripts/clang-format.bash +++ b/Utilities/Scripts/clang-format.bash @@ -130,6 +130,7 @@ $git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | # Exclude manually-formatted sources (e.g. with long lines). egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' | + egrep -z -v '^Tests/CompileFeatures/cxx_right_angle_brackets.cpp' | # Exclude sources with encoding not suported by clang-format. egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | |