kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix VS2917 warnings: C4091, C4477, C4302, C4311

Browse Source
This commit is contained in:
wmayer
2019-03-23 16:35:40 +01:00
parent 3c7d5bc151
commit e4be0cb36e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Base/MemDebug.cpp
View File

@@ -214,7 +214,7 @@ int __cdecl MemDebug::sAllocHook(
return(7);
fprintf( logFile,
"%s (#%7d) %12ld byte (%s) in %s line %d",
"%s (#%7d) %12Iu byte (%s) in %s line %d",
operation[nAllocType],lRequest, nSize, blockType[nBlockUse],szFileName, nLine);
if ( pvData != NULL )
fprintf( logFile, " at %p\n", pvData );
@@ -239,7 +239,7 @@ void __cdecl MemDebug::sDumpClientHook(
{
long requestNumber=0;
_CrtIsMemoryBlock(pUserData,(unsigned int)nBytes,&requestNumber,NULL,NULL);
fprintf( logFile, "Leak : (#%7d) %12ld bytes (%p) \n", requestNumber, nBytes, pUserData );
fprintf( logFile, "Leak : (#%7d) %12Iu bytes (%p) \n", requestNumber, nBytes, pUserData );
}

4
src/Base/StackWalker.cpp
View File

@@ -450,7 +450,7 @@ typedef struct IMAGEHLP_MODULE64_V3 {
// new elements: 17-Dec-2003
BOOL SourceIndexed; // pdb supports source server
BOOL Publics; // contains public symbols
};
} IMAGEHLP_MODULE64_V3;
typedef struct IMAGEHLP_MODULE64_V2 {
DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE64)
@@ -463,7 +463,7 @@ typedef struct IMAGEHLP_MODULE64_V2 {
CHAR ModuleName[32]; // module name
CHAR ImageName[256]; // image name
CHAR LoadedImageName[256]; // symbol file name
};
} IMAGEHLP_MODULE64_V2;
#pragma pack(pop)

2
src/Base/StackWalker.h
View File

@@ -139,7 +139,7 @@ protected:
CHAR loadedImageName[STACKWALK_MAX_NAMELEN];
} CallstackEntry;
typedef enum CallstackEntryType {firstEntry, nextEntry, lastEntry};
/*typedef*/ enum CallstackEntryType {firstEntry, nextEntry, lastEntry};
virtual void OnSymInit(LPCSTR szSearchPath, DWORD symOptions, LPCSTR szUserName);
virtual void OnLoadModule(LPCSTR img, LPCSTR mod, DWORD64 baseAddr, DWORD size, DWORD result, LPCSTR symType, LPCSTR pdbName, ULONGLONG fileVersion);

6
src/Gui/GuiConsole.cpp
View File

@@ -64,13 +64,13 @@ GUIConsole::GUIConsole (void)
::SetConsoleScreenBufferSize(::GetStdHandle(STD_OUTPUT_HANDLE),csbi.dwSize);
::SetConsoleTitleA( "FreeCAD Console");
*stdout = *::_fdopen(::_open_osfhandle(reinterpret_cast<LONG>(::GetStdHandle(STD_OUTPUT_HANDLE)), _O_TEXT), "w");
*stdout = *::_fdopen(::_open_osfhandle(reinterpret_cast<intptr_t>(::GetStdHandle(STD_OUTPUT_HANDLE)), _O_TEXT), "w");
::setvbuf(stdout, 0, _IONBF, 0);
*stdin = *::_fdopen(::_open_osfhandle(reinterpret_cast<LONG>(::GetStdHandle(STD_INPUT_HANDLE)), _O_TEXT), "r");
*stdin = *::_fdopen(::_open_osfhandle(reinterpret_cast<intptr_t>(::GetStdHandle(STD_INPUT_HANDLE)), _O_TEXT), "r");
::setvbuf(stdin, 0, _IONBF, 0);
*stderr = *::_fdopen(::_open_osfhandle(reinterpret_cast<LONG>(::GetStdHandle(STD_ERROR_HANDLE)), _O_TEXT), "w");
*stderr = *::_fdopen(::_open_osfhandle(reinterpret_cast<intptr_t>(::GetStdHandle(STD_ERROR_HANDLE)), _O_TEXT), "w");
::setvbuf(stderr, 0, _IONBF, 0);
}
}