summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-01-01 12:41:54 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-02-17 18:19:06 (GMT)
commit6010f93632c8de9405bc97e40fc06f5949c09976 (patch)
treeb55700dcdb16b9ab8a298bda09d0894f34eb1338
parent0550b9e330d75dfcb02257c998706759574cd9c0 (diff)
downloadCMake-6010f93632c8de9405bc97e40fc06f5949c09976.zip
CMake-6010f93632c8de9405bc97e40fc06f5949c09976.tar.gz
CMake-6010f93632c8de9405bc97e40fc06f5949c09976.tar.bz2
Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
This reverts commit ae6fc555a7e8929f6d96545bd1137c8bd378566d. Use the more-natural make_pair algorithm. The compiler motivating the need for this is not supported as a host anymore.
-rw-r--r--Source/cmGlobalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 227462d..1de4a59 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1387,7 +1387,7 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
cmQtAutoGenerators autogen;
if(autogen.InitializeAutogenTarget(&target))
{
- autogens.push_back(AutogensType::value_type(autogen, &target));
+ autogens.push_back(std::make_pair(autogen, &target));
}
}
}