[Cmake-commits] CMake branch, next, updated. v3.3.1-2321-g415769c

[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  415769c967b1b583fe350dd077b1142935b04361 (commit)
       via  1637bd5ec532d0226b9e9c335eba853f27cd5fa2 (commit)
      from  524481c809df3cb7b962af97ba1c9078dc5884c3 (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=415769c967b1b583fe350dd077b1142935b04361
commit 415769c967b1b583fe350dd077b1142935b04361
Merge: 524481c 1637bd5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 21 15:10:59 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 21 15:10:59 2015 -0400

    Merge topic 'fix-include_directories-BEFORE' into next
    
    1637bd5e fixup! include_directories: Fix regression in BEFORE option (#15693)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1637bd5ec532d0226b9e9c335eba853f27cd5fa2
commit 1637bd5ec532d0226b9e9c335eba853f27cd5fa2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 21 15:09:21 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 21 15:09:21 2015 -0400

    fixup! include_directories: Fix regression in BEFORE option (#15693)

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 81c7275..4ad6d3b 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1296,15 +1296,14 @@ void cmState::Directory::PrependIncludeDirectoriesEntry(
       this->DirectoryState->IncludeDirectories.begin()
       + this->Snapshot_.Position->IncludeDirectoryPosition;
 
-  std::vector<std::string>::const_reverse_iterator rend =
+  std::vector<std::string>::reverse_iterator rend =
       this->DirectoryState->IncludeDirectories.rend();
   std::vector<std::string>::reverse_iterator rbegin =
       cmMakeReverseIterator(entryEnd);
-  std::vector<std::string>::const_reverse_iterator crbegin = rbegin;
-  crbegin = std::find(crbegin, rend, cmPropertySentinal);
+  rbegin = std::find(rbegin, rend, cmPropertySentinal);
 
-  std::vector<std::string>::const_iterator entryIt = crbegin.base();
-  std::vector<std::string>::const_iterator entryBegin =
+  std::vector<std::string>::iterator entryIt = rbegin.base();
+  std::vector<std::string>::iterator entryBegin =
       this->DirectoryState->IncludeDirectories.begin();
 
   std::vector<cmListFileBacktrace>::iterator btIt =

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

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


hooks/post-receive
-- 
CMake