diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 11:24:28 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 11:24:28 +0200 |
| commit | 3385ed56b86a7816892e199fdda177ebb3a33966 (patch) | |
| tree | e4ebda8e1fc245e9a84c3c4b363c05bbbad3a85f /src/Globals.h | |
| parent | Suggestions (diff) | |
| parent | Updated prefabs to current Gallery content. (diff) | |
| download | cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.gz cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.bz2 cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.lz cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.xz cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.tar.zst cuberite-3385ed56b86a7816892e199fdda177ebb3a33966.zip | |
Diffstat (limited to 'src/Globals.h')
| -rw-r--r-- | src/Globals.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Globals.h b/src/Globals.h index 9b2f25f36..b35af9604 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -252,7 +252,7 @@ template class SizeChecker<UInt16, 2>; #include "MCLogger.h" #else // Logging functions -void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1,2); +void inline LOGERROR(const char* a_Format, ...) FORMATSTRING(1, 2); void inline LOGERROR(const char* a_Format, ...) { @@ -272,12 +272,12 @@ void inline LOGERROR(const char* a_Format, ...) /// Evaluates to the number of elements in an array (compile-time!) #define ARRAYCOUNT(X) (sizeof(X) / sizeof(*(X))) -/// Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)" ) +/// Allows arithmetic expressions like "32 KiB" (but consider using parenthesis around it, "(32 KiB)") #define KiB * 1024 #define MiB * 1024 * 1024 /// Faster than (int)floorf((float)x / (float)div) -#define FAST_FLOOR_DIV( x, div ) (((x) - (((x) < 0) ? ((div) - 1) : 0)) / (div)) +#define FAST_FLOOR_DIV( x, div) (((x) - (((x) < 0) ? ((div) - 1) : 0)) / (div)) // Own version of assert() that writes failed assertions to the log for review #ifdef TEST_GLOBALS @@ -309,19 +309,19 @@ void inline LOGERROR(const char* a_Format, ...) } #endif #define ASSERT(x) do { if (!(x)) { throw cAssertFailure();} } while (0) - #define testassert(x) do { if(!(x)) { REPORT_ERROR("Test failure: %s, file %s, line %d\n", #x, __FILE__, __LINE__); exit(1); } } while (0) + #define testassert(x) do { if (!(x)) { REPORT_ERROR("Test failure: %s, file %s, line %d\n", #x, __FILE__, __LINE__); exit(1); } } while (0) #define CheckAsserts(x) do { try {x} catch (cAssertFailure) { break; } REPORT_ERROR("Test failure: assert didn't fire for %s, file %s, line %d\n", #x, __FILE__, __LINE__); exit(1); } while (0) #else #ifdef _DEBUG - #define ASSERT( x ) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), assert(0), 0 ) ) + #define ASSERT( x) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__), assert(0), 0)) #else #define ASSERT(x) ((void)(x)) #endif #endif // Pretty much the same as ASSERT() but stays in Release builds -#define VERIFY( x ) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), exit(1), 0 ) ) +#define VERIFY( x) ( !!(x) || ( LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), exit(1), 0)) // Same as assert but in all Self test builds #ifdef SELF_TEST |