diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-30 16:27:21 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-30 16:27:21 +0000 |
| commit | a9b84905962fff1504061428c7f27cf116257128 (patch) | |
| tree | c734046596c133018b2ce7ca31ca25e5ac9415cb | |
| parent | b13f03cad14e123a740ba637d185a88c32679721 (diff) | |
| download | include-a9b84905962fff1504061428c7f27cf116257128.tar.gz | |
Revert of Rename SK_DEBUGBREAK to SK_ALWAYSBREAK (https://codereview.chromium.org/263553012/)
Reason for revert:
Broke windows bot
Original issue's description:
> Rename SK_DEBUGBREAK to SK_ALWAYSBREAK
>
> Committed: http://code.google.com/p/skia/source/detail?r=14473
R=caryclark@google.com, reed@google.com
TBR=caryclark@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/260763003
git-svn-id: http://skia.googlecode.com/svn/trunk/include@14476 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | core/SkPostConfig.h | 10 | ||||
| -rw-r--r-- | core/SkTypes.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/SkPostConfig.h b/core/SkPostConfig.h index 88a2bfc..bee87e6 100644 --- a/core/SkPostConfig.h +++ b/core/SkPostConfig.h @@ -154,8 +154,8 @@ # undef NOMINMAX # endif # -# ifndef SK_ALWAYSBREAK -# define SK_ALWAYSBREAK(p) do { if (!(p)) { SkNO_RETURN_HINT(); __debugbreak(); }} while (false) +# ifndef SK_DEBUGBREAK +# define SK_DEBUGBREAK(p) do { if (!(p)) { SkNO_RETURN_HINT(); __debugbreak(); }} while (false) # endif # # ifndef SK_A32_SHIFT @@ -166,14 +166,14 @@ # endif # #else -# ifndef SK_ALWAYSBREAK +# ifndef SK_DEBUGBREAK # ifdef SK_DEBUG # include <stdio.h> -# define SK_ALWAYSBREAK(cond) do { if (cond) break; \ +# define SK_DEBUGBREAK(cond) do { if (cond) break; \ SkDebugf("%s:%d: failed assertion \"%s\"\n", \ __FILE__, __LINE__, #cond); SK_CRASH(); } while (false) # else -# define SK_ALWAYSBREAK(cond) do { if (cond) break; SK_CRASH(); } while (false) +# define SK_DEBUGBREAK(cond) do { if (cond) break; SK_CRASH(); } while (false) # endif # endif #endif diff --git a/core/SkTypes.h b/core/SkTypes.h index 15de8a4..8863b07 100644 --- a/core/SkTypes.h +++ b/core/SkTypes.h @@ -93,7 +93,7 @@ inline void operator delete(void* p) { #endif #ifdef SK_DEBUG - #define SkASSERT(cond) SK_ALWAYSBREAK(cond) + #define SkASSERT(cond) SK_DEBUGBREAK(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_ALWAYSBREAK(false && message) +#define SkFAIL(message) SK_DEBUGBREAK(false && message) #ifdef SK_DEVELOPER #define SkDEVCODE(code) code |