[Cmake-commits] CMake branch, next, updated. v3.5.2-1432-g8b73270

[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  8b73270788d204926dfe1ef6afae5172770688d0 (commit)
       via  ef78dbcec7180239418f13ae5cf497ffa177752e (commit)
      from  be67d1511c9405731b51737226373eb93aa3f06d (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=8b73270788d204926dfe1ef6afae5172770688d0
commit 8b73270788d204926dfe1ef6afae5172770688d0
Merge: be67d15 ef78dbc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 14:47:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 14:47:28 2016 -0400

    Merge topic 'clang-format-source' into next
    
    ef78dbce cmGeneratorTarget: Protect macro code layout from clang-format


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef78dbcec7180239418f13ae5cf497ffa177752e
commit ef78dbcec7180239418f13ae5cf497ffa177752e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 14:44:13 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 16 14:44:38 2016 -0400

    cmGeneratorTarget: Protect macro code layout from clang-format
    
    The `IMPLEMENT_VISIT_IMPL` macro must preserve a space before the `>`
    character in case the `DATATYPE` is a template type ending in `>`.
    Manually format the macro layout as clang-format would except for this
    space.  Then add markup to tell clang-format not to format this macro.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 1e078d9..31fff9f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -518,16 +518,18 @@ static void handleSystemIncludesDep(
   }
 }
 
+/* clang-format off */
 #define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE)                                  \
   {                                                                           \
     std::vector<cmSourceFile*> sourceFiles;                                   \
     this->GetSourceFiles(sourceFiles, config);                                \
-    TagVisitor<DATA##Tag DATATYPE> visitor(this, data);                       \
+    TagVisitor< DATA##Tag DATATYPE > visitor(this, data);                     \
     for (std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \
          si != sourceFiles.end(); ++si) {                                     \
       visitor.Accept(*si);                                                    \
     }                                                                         \
   }
+/* clang-format on */
 
 #define IMPLEMENT_VISIT(DATA) IMPLEMENT_VISIT_IMPL(DATA, EMPTY)
 

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake