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 e590856721fcfb8ca7a491de62d5656121f5a6bc (commit)
via 4bb76decc81ea1e4a9a4ea4ac731d68b3ddd74e4 (commit)
from 268e3a63a1dcb31ef9a8cd2b2b1ab173185f4518 (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=e590856721fcfb8ca7a491de62d5656121f5a6bc
commit e590856721fcfb8ca7a491de62d5656121f5a6bc
Merge: 268e3a6 4bb76de
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 21 02:54:26 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 21 02:54:26 2013 -0500
Merge topic 'fix-COMPATIBLE_INTERFACE-properties' into next
4bb76de Don't use insert on a std::set with a range.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bb76decc81ea1e4a9a4ea4ac731d68b3ddd74e4
commit 4bb76decc81ea1e4a9a4ea4ac731d68b3ddd74e4
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Jan 21 08:51:31 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Jan 21 08:53:17 2013 +0100
Don't use insert on a std::set with a range.
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 4547d73..3a6294a 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -190,7 +190,11 @@ void getPropertyContents(cmTarget *tgt, const char *prop,
}
std::vector<std::string> content;
cmSystemTools::ExpandListArgument(p, content);
- ifaceProperties.insert(content.begin(), content.end());
+ for (std::vector<std::string>::const_iterator ci = content.begin();
+ ci != content.end(); ++ci)
+ {
+ ifaceProperties.insert(*ci);
+ }
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportFileGenerator.cxx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
