[Cmake-commits] CMake branch, next, updated. v3.7.1-2149-g60a120f

[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  60a120f1fb48fada4cf3a50413b729b4db9694d3 (commit)
       via  c2dd8d68cb817791ce86488da1539cbdf5167ebb (commit)
      from  a3de35d1b09f4798603aa33ae92f648607952225 (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=60a120f1fb48fada4cf3a50413b729b4db9694d3
commit 60a120f1fb48fada4cf3a50413b729b4db9694d3
Merge: a3de35d c2dd8d6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:47:39 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 08:47:39 2017 -0500

    Merge topic 'source_group-tree' into next
    
    c2dd8d68 fixup! source_group: Add options create groups matching directory tree


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2dd8d68cb817791ce86488da1539cbdf5167ebb
commit c2dd8d68cb817791ce86488da1539cbdf5167ebb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 08:47:27 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 08:47:27 2017 -0500

    fixup! source_group: Add options create groups matching directory tree

diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 8b11fb1..5555199 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -72,8 +72,8 @@ bool addFilesToItsSourceGroups(const std::set<std::string>& sgFilesPaths,
 {
   cmSourceGroup* sg;
 
-  for (std::set<std::string>::const_iterator it = std::begin(sgFilesPaths);
-       it != std::end(sgFilesPaths); ++it) {
+  for (std::set<std::string>::const_iterator it = sgFilesPaths.begin();
+       it != sgFilesPaths.end(); ++it) {
 
     std::vector<std::string> tokenizedPath;
     if (!prefix.empty()) {
@@ -231,8 +231,8 @@ bool cmSourceGroupCommand::processTree(const std::vector<std::string>& args,
     filesBegin = FilesWithPrefixKeywordIndex + 1;
   }
 
-  const std::vector<std::string> filesVector(args.cbegin() + filesBegin,
-                                             args.cend());
+  const std::vector<std::string> filesVector(args.begin() + filesBegin,
+                                             args.end());
 
   std::set<std::string> sourceGroupPaths = getSourceGroupFilesPaths(
     this->Makefile->GetCurrentSourceDirectory(), root, filesVector);

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

Summary of changes:
 Source/cmSourceGroupCommand.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake