summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-20 15:04:32 (GMT)
committerBrad King <brad.king@kitware.com>2013-12-20 15:06:45 (GMT)
commitae6fc555a7e8929f6d96545bd1137c8bd378566d (patch)
treec29313646a1d39c873535551f81b80797d919b8a
parentc62cd3e2aeb9ed7e3021bd9e5863294fd0441790 (diff)
downloadCMake-ae6fc555a7e8929f6d96545bd1137c8bd378566d.zip
CMake-ae6fc555a7e8929f6d96545bd1137c8bd378566d.tar.gz
CMake-ae6fc555a7e8929f6d96545bd1137c8bd378566d.tar.bz2
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*>".
-rw-r--r--Source/cmGlobalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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));
}
}
}