From ae6fc555a7e8929f6d96545bd1137c8bd378566d Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Dec 2013 10:04:32 -0500 Subject: [PATCH] cmGlobalGenerator: Fix value type pushed into autogens vector The parent commit changed the AutogensType::value_type to be "std::pair" but our std::make_pair call returns "std::pair". 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&" in call to "std::vector > ::push_back(const std::pair&)" is being passed "std::pair". --- Source/cmGlobalGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e4a924621..16dfdd38e 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)); } } }