OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0024168: Eliminate CLang compiler warning -Wunused-variable

Browse Source 
Got rid of warning -Wunused-variable

In FSD_File, use template specialization instead of comparison of sizeof() to specific value in if statement, thus eliminating warning "constant value in conditional expression"
This commit is contained in:
omy
2013-09-11 16:52:16 +04:00
committed by abv
parent 74d80fb976
commit 295cb05393
16 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/OSD/OSD_MAllocHook.cxx
View File

@@ -83,37 +83,46 @@ OSD_MAllocHook::CollectBySize* OSD_MAllocHook::GetCollectBySize()
#ifdef WNT
#include <crtdbg.h>
#if _MSC_VER == 1500 /* VS 2008 */
static long getRequestNum(void* pvData, long lRequest, size_t& theSize)
{
#if _MSC_VER == 1500 /* VS 2008 */
#ifdef _DEBUG /* in Release, _CrtIsValidHeapPointer is always 1 */
if (_CrtIsValidHeapPointer(pvData))
#ifdef _DEBUG /* protect against invalid pointer; in Release, _CrtIsValidHeapPointer is always 1 */
if (!_CrtIsValidHeapPointer(pvData))
return lRequest;
#else
(void)lRequest; // avoid compiler warning on unused arg
#endif
{
#define nNoMansLandSize 4
// the header struct is taken from crt/src/dbgint.h
struct _CrtMemBlockHeader
{
// the header struct is taken from crt/src/dbgint.h
struct _CrtMemBlockHeader
{
#ifdef _WIN64
int nBlockUse;
size_t nDataSize;
int nBlockUse;
size_t nDataSize;
#else
size_t nDataSize;
int nBlockUse;
#endif
long lRequest;
unsigned char gap[nNoMansLandSize];
};
_CrtMemBlockHeader* aHeader = ((_CrtMemBlockHeader*)pvData)-1;
theSize = aHeader->nDataSize;
return aHeader->lRequest;
}
#else
(void)pvData; (void)theSize; // avoid compiler warning on unused arg
size_t nDataSize;
int nBlockUse;
#endif
long lRequest;
unsigned char gap[nNoMansLandSize];
};
_CrtMemBlockHeader* aHeader = ((_CrtMemBlockHeader*)pvData)-1;
theSize = aHeader->nDataSize;
return aHeader->lRequest;
}
#else /* _MSC_VER == 1500 */
static long getRequestNum(void* /*pvData*/, long lRequest, size_t& /*theSize*/)
{
return lRequest;
}
#endif /* _MSC_VER == 1500 */
int __cdecl MyAllocHook(int nAllocType,
void * pvData,
size_t nSize,