dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

VC6 can't handle typename here but GCC requires it

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6973 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-01-30 00:45:16 +00:00
parent e17e508012
commit 18d25cf859
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/build.h
View file

@ -171,7 +171,11 @@ class DiagState {
template<class C, class K, class V> void insert_or_assign(C&c, const K&k, V val) template<class C, class K, class V> void insert_or_assign(C&c, const K&k, V val)
{ {
typename C::value_type item(k, val); typename C::value_type item(k, val);
#if defined(_MSC_VER) && _MSC_VER <= 1200
std::pair<C::iterator, bool> ret = c.insert(item); std::pair<C::iterator, bool> ret = c.insert(item);
#else
std::pair<typename C::iterator, bool> ret = c.insert(item);
#endif
if (!ret.second) ret.first->second = val; if (!ret.second) ret.first->second = val;
} }
template<class C, class K> typename mapped_type_helper<C>::type get_paired_value(const C&c, const K&k, typename mapped_type_helper<C>::type defval) const template<class C, class K> typename mapped_type_helper<C>::type get_paired_value(const C&c, const K&k, typename mapped_type_helper<C>::type defval) const