From 18d25cf85926ed0b63109e6972f92f628e1604fa Mon Sep 17 00:00:00 2001 From: anders_k Date: Tue, 30 Jan 2018 00:45:16 +0000 Subject: [PATCH] VC6 can't handle typename here but GCC requires it git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6973 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/build.h b/Source/build.h index aec7b143..c38769de 100644 --- a/Source/build.h +++ b/Source/build.h @@ -171,7 +171,11 @@ class DiagState { template void insert_or_assign(C&c, const K&k, V val) { typename C::value_type item(k, val); +#if defined(_MSC_VER) && _MSC_VER <= 1200 std::pair ret = c.insert(item); +#else + std::pair ret = c.insert(item); +#endif if (!ret.second) ret.first->second = val; } template typename mapped_type_helper::type get_paired_value(const C&c, const K&k, typename mapped_type_helper::type defval) const