[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1217-g3faad24

[Stephen Kelly]

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  3faad24c0fa9477039131634b273fa8c5b43195d (commit)
       via  8c3193c1872da07cef8d77473bd977727a7a79a1 (commit)
      from  efdeee5959385baa82287700b7f57200229a7fc6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3faad24c0fa9477039131634b273fa8c5b43195d
commit 3faad24c0fa9477039131634b273fa8c5b43195d
Merge: efdeee5 8c3193c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 21 14:33:54 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 14:33:54 2015 -0400

    Merge topic 'refactor-cmMakefile-properties' into next
    
    8c3193c1 Fixup insertion and iterators.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c3193c1872da07cef8d77473bd977727a7a79a1
commit 8c3193c1872da07cef8d77473bd977727a7a79a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 21 20:33:08 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 21 20:33:08 2015 +0200

    Fixup insertion and iterators.

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 60e1fd8..ba68939 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1157,26 +1157,26 @@ void cmState::Directory::AppendIncludeDirectoriesEntry(
 void cmState::Directory::PrependIncludeDirectoriesEntry(
     const std::string& vec, const cmListFileBacktrace& lfbt)
 {
-  std::vector<std::string>::const_iterator entryEnd =
-      this->DirectoryState->IncludeDirectories.begin();
-  std::advance(
-      entryEnd, this->Snapshot_.Position->ThisIncludeDirectoryPosition);
+  std::vector<std::string>::iterator entryEnd =
+      this->DirectoryState->IncludeDirectories.begin()
+      + this->Snapshot_.Position->ThisIncludeDirectoryPosition;
 
   std::vector<std::string>::const_reverse_iterator rend =
       this->DirectoryState->IncludeDirectories.rend();
-  std::vector<std::string>::const_reverse_iterator rbegin =
-      std::reverse_iterator<std::vector<std::string>::const_iterator>(entryEnd);
-  rbegin = std::find(rbegin, rend, std::string());
+  std::vector<std::string>::reverse_iterator rbegin =
+      std::reverse_iterator<std::vector<std::string>::iterator>(entryEnd);
+  std::vector<std::string>::const_reverse_iterator crbegin = rbegin;
+  crbegin = std::find(crbegin, rend, std::string());
 
-  std::vector<std::string>::const_iterator entryIt = rbegin.base();
+  std::vector<std::string>::const_iterator entryIt = crbegin.base();
   std::vector<std::string>::const_iterator entryBegin =
       this->DirectoryState->IncludeDirectories.begin();
 
-  std::vector<cmListFileBacktrace>::const_iterator btIt =
-      this->DirectoryState->IncludeDirectoryBacktraces.begin();
-  std::advance(btIt, std::distance(entryBegin, entryIt));
+  std::vector<cmListFileBacktrace>::iterator btIt =
+      this->DirectoryState->IncludeDirectoryBacktraces.begin()
+      + std::distance(entryBegin, entryIt);
 
-  this->DirectoryState->IncludeDirectories.insert(entryIt, vec);
+  this->DirectoryState->IncludeDirectories.insert(rbegin.base(), vec);
   this->DirectoryState->IncludeDirectoryBacktraces.insert(btIt, lfbt);
 
   this->Snapshot_.Position->ThisIncludeDirectoryPosition =

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

Summary of changes:
 Source/cmState.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake