From e4be0cb36ecbbe64799824beec8ae7f8065e3623 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 23 Mar 2019 16:35:40 +0100 Subject: [PATCH] fix VS2917 warnings: C4091, C4477, C4302, C4311 --- src/Base/MemDebug.cpp | 4 ++-- src/Base/StackWalker.cpp | 4 ++-- src/Base/StackWalker.h | 2 +- src/Gui/GuiConsole.cpp | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Base/MemDebug.cpp b/src/Base/MemDebug.cpp index 32bdcf3f7a..ac06e56391 100644 --- a/src/Base/MemDebug.cpp +++ b/src/Base/MemDebug.cpp @@ -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 ); } diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp index b8bd929cb2..152886cd58 100644 --- a/src/Base/StackWalker.cpp +++ b/src/Base/StackWalker.cpp @@ -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) diff --git a/src/Base/StackWalker.h b/src/Base/StackWalker.h index ff44e36b5f..788c818223 100644 --- a/src/Base/StackWalker.h +++ b/src/Base/StackWalker.h @@ -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); diff --git a/src/Gui/GuiConsole.cpp b/src/Gui/GuiConsole.cpp index 70c7c6ec9f..ec9d2c44ae 100644 --- a/src/Gui/GuiConsole.cpp +++ b/src/Gui/GuiConsole.cpp @@ -64,13 +64,13 @@ GUIConsole::GUIConsole (void) ::SetConsoleScreenBufferSize(::GetStdHandle(STD_OUTPUT_HANDLE),csbi.dwSize); ::SetConsoleTitleA( "FreeCAD Console"); - *stdout = *::_fdopen(::_open_osfhandle(reinterpret_cast(::GetStdHandle(STD_OUTPUT_HANDLE)), _O_TEXT), "w"); + *stdout = *::_fdopen(::_open_osfhandle(reinterpret_cast(::GetStdHandle(STD_OUTPUT_HANDLE)), _O_TEXT), "w"); ::setvbuf(stdout, 0, _IONBF, 0); - *stdin = *::_fdopen(::_open_osfhandle(reinterpret_cast(::GetStdHandle(STD_INPUT_HANDLE)), _O_TEXT), "r"); + *stdin = *::_fdopen(::_open_osfhandle(reinterpret_cast(::GetStdHandle(STD_INPUT_HANDLE)), _O_TEXT), "r"); ::setvbuf(stdin, 0, _IONBF, 0); - *stderr = *::_fdopen(::_open_osfhandle(reinterpret_cast(::GetStdHandle(STD_ERROR_HANDLE)), _O_TEXT), "w"); + *stderr = *::_fdopen(::_open_osfhandle(reinterpret_cast(::GetStdHandle(STD_ERROR_HANDLE)), _O_TEXT), "w"); ::setvbuf(stderr, 0, _IONBF, 0); } }