[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-757-g331a992

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  331a9929897ad4ba864320e12bee96db86ffd8fe (commit)
       via  68e7250a9facbe7b82cff17af3bf2a831e481f3c (commit)
      from  24e5bff0eb7e82d34775a029296858b8142ff02f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=331a9929897ad4ba864320e12bee96db86ffd8fe
commit 331a9929897ad4ba864320e12bee96db86ffd8fe
Merge: 24e5bff 68e7250
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 25 13:43:41 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 25 13:43:41 2016 -0400

    Merge topic 'fix-right-angle-bracket-feature-test' into next
    
    68e7250a Features: Fix cxx_right_angle_brackets compiler feature test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68e7250a9facbe7b82cff17af3bf2a831e481f3c
commit 68e7250a9facbe7b82cff17af3bf2a831e481f3c
Author:     Alex Wang <aw1621107 at gmail.com>
AuthorDate: Tue Oct 25 13:30:42 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 25 13:38:12 2016 -0400

    Features: Fix cxx_right_angle_brackets compiler feature test
    
    The clang-format pass in commit v3.6.0-rc1~54^2~1 (Revise C++ coding
    style using clang-format, 2016-05-16) changed the template right angle
    brackets from `>>` to `> >`, which defeats the purpose of this test.
    Change it back and exclude this content from formatting.

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' |

-----------------------------------------------------------------------

Summary of changes:
 Tests/CompileFeatures/cxx_right_angle_brackets.cpp |    4 +++-
 Utilities/Scripts/clang-format.bash                |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake