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 726f9c2247f6742b01c4a8bfc632d7fba651d60b (commit)
via ae6fc555a7e8929f6d96545bd1137c8bd378566d (commit)
from 90bb67e10528ff620f2294027a9d99efbf1ff0c4 (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=726f9c2247f6742b01c4a8bfc632d7fba651d60b
commit 726f9c2247f6742b01c4a8bfc632d7fba651d60b
Merge: 90bb67e ae6fc55
Author: Brad King <[email protected]>
AuthorDate: Fri Dec 20 10:09:50 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Fri Dec 20 10:09:50 2013 -0500
Merge topic 'constify' into next
ae6fc55 cmGlobalGenerator: Fix value type pushed into autogens vector
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae6fc555a7e8929f6d96545bd1137c8bd378566d
commit ae6fc555a7e8929f6d96545bd1137c8bd378566d
Author: Brad King <[email protected]>
AuthorDate: Fri Dec 20 10:04:32 2013 -0500
Commit: Brad King <[email protected]>
CommitDate: Fri Dec 20 10:06:45 2013 -0500
cmGlobalGenerator: Fix value type pushed into autogens vector
The parent commit changed the AutogensType::value_type to be
"std::pair<cmQtAutoGenerators,cmTarget const*>" but our std::make_pair
call returns "std::pair<cmQtAutoGenerators,cmTarget*>". Construct the
value_type directly instead of using make_pair. Otherwise the Sun 5.9
compiler complains
".../Source/cmGlobalGenerator.cxx", line 1281: Error:
Formal argument x of type "const std::pair<cmQtAutoGenerators, const
cmTarget*>&"
in call to "std::vector<std::pair<cmQtAutoGenerators, const cmTarget*> >
::push_back(const std::pair<cmQtAutoGenerators, const cmTarget*>&)" is
being
passed "std::pair<cmQtAutoGenerators, cmTarget*>".
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e4a9246..16dfdd3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1278,7 +1278,7 @@ void
cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
cmQtAutoGenerators autogen;
if(autogen.InitializeAutogenTarget(&target))
{
- autogens.push_back(std::make_pair(autogen, &target));
+ autogens.push_back(AutogensType::value_type(autogen, &target));
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
