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

Fixed all VS2015 warnings except C4577 ('noexcept' used with no exception handling mode specified)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6627 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-10-30 03:55:30 +00:00
parent b54c831ff0
commit 1c1d1d5e12
12 changed files with 124 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Contrib/NSISdl/util.cpp
View file

@ -9,8 +9,7 @@
** Keep everything here strictly ANSI. No TCHAR style stuff.
*/
#include "netinc.h"
#include <windows.h>
#include "util.h"
int my_atoi(char *s)
@ -75,10 +74,26 @@ void myitoa64(__int64 i, char *buffer)
*buffer = 0;
}
// Visual Studio 2015 (CLv19 x86) and some older versions of CLv14 x64 will optimize
// our loop into a direct call to _memset and this fails to link because we don't use the CRT
#if defined(_MSC_VER) && _MSC_VER+0 >= 1400
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER+0 >= 140050727
#include <intrin.h>
#else
EXTERN_C void __stosb(BYTE*,BYTE,size_t);
#endif //~ _MSC_FULL_VER >= 140050727
#pragma intrinsic(__stosb)
#define CRTINTRINSIC_memset(p,c,s) __stosb((BYTE*)(p),(BYTE)(c),(s))
#endif //~ _MSC_VER
void mini_memset(void *o,char i,int l)
{
#ifdef CRTINTRINSIC_memset
CRTINTRINSIC_memset(o, i, l);
#else
char *oo=(char*)o;
while (l-- > 0) *oo++=i;
#endif
}
void mini_memcpy(void *o,void*i,int l)
{