diff options
author | 2014-04-30 18:24:16 +0000 | |
---|---|---|
committer | 2014-04-30 18:24:16 +0000 | |
commit | 45d1d1d9a71253e0ed28ba87f5f946b5845f1d6d (patch) | |
tree | e23bc98b25b8a9fa7c819c300629966faa31726a /include | |
parent | 715d88a4e94c4890f324cbace435c0627af67cc1 (diff) |
Rename SK_DEBUGBREAK to SK_ALWAYSBREAK
Committed: http://code.google.com/p/skia/source/detail?r=14473
R=caryclark@google.com, reed@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/263553012
git-svn-id: http://skia.googlecode.com/svn/trunk@14481 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkPostConfig.h | 10 | ||||
-rw-r--r-- | include/core/SkTypes.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index bee87e6212..88a2bfcb64 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -154,8 +154,8 @@ # undef NOMINMAX # endif # -# ifndef SK_DEBUGBREAK -# define SK_DEBUGBREAK(p) do { if (!(p)) { SkNO_RETURN_HINT(); __debugbreak(); }} while (false) +# ifndef SK_ALWAYSBREAK +# define SK_ALWAYSBREAK(p) do { if (!(p)) { SkNO_RETURN_HINT(); __debugbreak(); }} while (false) # endif # # ifndef SK_A32_SHIFT @@ -166,14 +166,14 @@ # endif # #else -# ifndef SK_DEBUGBREAK +# ifndef SK_ALWAYSBREAK # ifdef SK_DEBUG # include <stdio.h> -# define SK_DEBUGBREAK(cond) do { if (cond) break; \ +# define SK_ALWAYSBREAK(cond) do { if (cond) break; \ SkDebugf("%s:%d: failed assertion \"%s\"\n", \ __FILE__, __LINE__, #cond); SK_CRASH(); } while (false) # else -# define SK_DEBUGBREAK(cond) do { if (cond) break; SK_CRASH(); } while (false) +# define SK_ALWAYSBREAK(cond) do { if (cond) break; SK_CRASH(); } while (false) # endif # endif #endif diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 8863b07326..15de8a4937 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -93,7 +93,7 @@ inline void operator delete(void* p) { #endif #ifdef SK_DEBUG - #define SkASSERT(cond) SK_DEBUGBREAK(cond) + #define SkASSERT(cond) SK_ALWAYSBREAK(cond) #define SkDEBUGFAIL(message) SkASSERT(false && message) #define SkDEBUGCODE(code) code #define SkDECLAREPARAM(type, var) , type var @@ -113,7 +113,7 @@ inline void operator delete(void* p) { #define SkAssertResult(cond) cond #endif -#define SkFAIL(message) SK_DEBUGBREAK(false && message) +#define SkFAIL(message) SK_ALWAYSBREAK(false && message) #ifdef SK_DEVELOPER #define SkDEVCODE(code) code |