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

List plug-in directories when plug-in call fails

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7011 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-06-25 21:33:30 +00:00
parent 2eb0d5cdf1
commit bfdec13982
7 changed files with 56 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/build.h
View file

@ -169,15 +169,11 @@ namespace MakensisAPI {
#define FLAG_OFFSET(flag) (FIELD_OFFSET(exec_flags_t, flag)/sizeof(int))
class DiagState {
template<class M> struct mapped_type_helper { typedef typename M::value_type::second_type type; }; // VC6 uses referent_type and not mapped_type
template<class M> struct mapped_type_helper { typedef typename STLHelpers::mapped_type_helper<M>::type type; };
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);
#if defined(_MSC_VER) && _MSC_VER <= 1200
std::pair<C::iterator, bool> ret = c.insert(item);
#else
std::pair<typename C::iterator, bool> ret = c.insert(item);
#endif
std::pair<NSIS_CXX_TYPENAME C::iterator, bool> ret = c.insert(item);
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