[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1694-gaea2711
Stephen Kelly
steveire at gmail.com
Mon Jan 21 02:48:42 EST 2013
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 aea271102af77135310a6dfef44d75cc328ac67e (commit)
via 7aaacd92dc0438404144351e90f7976bd6addbb7 (commit)
from 1bbf44a788987e602d9c032be198ed919afcc6f2 (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=aea271102af77135310a6dfef44d75cc328ac67e
commit aea271102af77135310a6dfef44d75cc328ac67e
Merge: 1bbf44a 7aaacd9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 21 02:48:40 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 21 02:48:40 2013 -0500
Merge topic 'clean-include-dirs-debugging' into next
7aaacd9 Don't use insert on a std::set with a range.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7aaacd92dc0438404144351e90f7976bd6addbb7
commit 7aaacd92dc0438404144351e90f7976bd6addbb7
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 21 08:46:15 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 21 08:46:15 2013 +0100
Don't use insert on a std::set with a range.
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx
index bfee06f..671e09f 100644
--- a/Source/cmIncludeDirectoryCommand.cxx
+++ b/Source/cmIncludeDirectoryCommand.cxx
@@ -71,7 +71,11 @@ bool cmIncludeDirectoryCommand
}
if (system)
{
- systemIncludes.insert(includes.begin(), includes.end());
+ for (std::vector<std::string>::const_iterator li = includes.begin();
+ li != includes.end(); ++li)
+ {
+ systemIncludes.insert(*li);
+ }
}
}
std::reverse(beforeIncludes.begin(), beforeIncludes.end());
-----------------------------------------------------------------------
Summary of changes:
Source/cmIncludeDirectoryCommand.cxx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list