AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Apparently I didn't test my fix for warning 4127 because it didn't actually work. Now fixed :-)

Browse Source
This commit is contained in:
Daviw Williams 2013-03-04 17:10:23 +01:00
parent 23042c3fcb
commit 6374ebf092
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
View File

@ -36,12 +36,17 @@ freely, subject to the following restrictions:
#define POLYVOX_HALT() std::exit(EXIT_FAILURE) #define POLYVOX_HALT() std::exit(EXIT_FAILURE)
#endif #endif
// We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) // Macros cannot contain #ifdefs, but some of our macros need to disable warnings and such warning supression is
// but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution // platform specific. But macros can contain other macros, so we create macros to control the warnings and use
// (http://stackoverflow.com/a/1946485) is to disable these warnings. // those instead. This set of warning supression macros can be extended to GCC/Clang when required.
#if defined(_MSC_VER) #if defined(_MSC_VER)
__pragma(warning(push)) #define POLYVOX_MSC_WARNING_PUSH __pragma(warning(push))
__pragma(warning(disable:4127)) #define POLYVOX_DISABLE_MSC_WARNING(x) __pragma(warning(disable:x))
#define POLYVOX_MSC_WARNING_POP __pragma(warning(pop))
#else
#define POLYVOX_MSC_WARNING_PUSH
#define POLYVOX_DISABLE_MSC_WARNING(x)
#define POLYVOX_MSC_WARNING_POP
#endif #endif
#define POLYVOX_UNUSED(x) do { (void)sizeof(x); } while(0) #define POLYVOX_UNUSED(x) do { (void)sizeof(x); } while(0)
@ -57,6 +62,11 @@ freely, subject to the following restrictions:
#ifdef POLYVOX_ASSERTS_ENABLED #ifdef POLYVOX_ASSERTS_ENABLED
#define POLYVOX_ASSERT(condition, message) \ #define POLYVOX_ASSERT(condition, message) \
/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
(http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
POLYVOX_MSC_WARNING_PUSH \
POLYVOX_DISABLE_MSC_WARNING(4127) \
do \ do \
{ \ { \
if (!(condition)) \ if (!(condition)) \
@ -69,12 +79,19 @@ freely, subject to the following restrictions:
std::cerr << " Location: " << "Line " << __LINE__ << " of " << __FILE__ << std::endl << std::endl; \ std::cerr << " Location: " << "Line " << __LINE__ << " of " << __FILE__ << std::endl << std::endl; \
POLYVOX_HALT(); \ POLYVOX_HALT(); \
} \ } \
} while(0) } while(0) \
POLYVOX_MSC_WARNING_POP
#else #else
#define POLYVOX_ASSERT(condition, message) \ #define POLYVOX_ASSERT(condition, message) \
do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) /* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
(http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
POLYVOX_MSC_WARNING_PUSH \
POLYVOX_DISABLE_MSC_WARNING(4127) \
do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
POLYVOX_MSC_WARNING_POP
#endif #endif
@ -128,9 +145,4 @@ freely, subject to the following restrictions:
getThrowHandler()((except), __FILE__, __LINE__) getThrowHandler()((except), __FILE__, __LINE__)
#endif #endif
// See the corresponding 'push' above.
#if defined(_MSC_VER)
__pragma(warning(pop))
#endif
#endif //__PolyVox_ErrorHandling_H__ #endif //__PolyVox_ErrorHandling_H__