Skip to content

A
angle
Commit 9dbd6262 by Geoff Lang Committed by Commit Bot
Options

Don't put newlines in macros that call ERR, it already adds one.

BUG=angleproject:1442 Change-Id: Ia4b4a3f9dc870a53b6c793c6bfc07b76d6b19673 Reviewed-on: https://chromium-review.googlesource.com/413038Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent 3b573612
Showing with 3 additions and 3 deletions
src/common/debug.h
...@@ -145,7 +145,7 @@ std::ostream &DummyStream(); ...@@ -145,7 +145,7 @@ std::ostream &DummyStream();
#if ANGLE_ASSERTS_ON #if ANGLE_ASSERTS_ON
#define ASSERT(expression) \ #define ASSERT(expression) \
(expression ? static_cast<void>(0) \ (expression ? static_cast<void>(0) \
: (ERR("\t! Assert failed in %s(%d): %s\n", __FUNCTION__, __LINE__, #expression), \ : (ERR("\t! Assert failed in %s(%d): %s", __FUNCTION__, __LINE__, #expression), \
ANGLE_ASSERT_IMPL(expression))) ANGLE_ASSERT_IMPL(expression)))
#else #else
#define ASSERT(condition) \ #define ASSERT(condition) \
...@@ -162,13 +162,13 @@ std::ostream &DummyStream(); ...@@ -162,13 +162,13 @@ std::ostream &DummyStream();
#define UNIMPLEMENTED() \ #define UNIMPLEMENTED() \
{ \ { \
ERR("\t! Unimplemented: %s(%d)\n", __FUNCTION__, __LINE__); \ ERR("\t! Unimplemented: %s(%d)", __FUNCTION__, __LINE__); \
ASSERT(NOASSERT_UNIMPLEMENTED); \ ASSERT(NOASSERT_UNIMPLEMENTED); \
} \ } \
ANGLE_EMPTY_STATEMENT ANGLE_EMPTY_STATEMENT
// A macro for code which is not expected to be reached under valid assumptions // A macro for code which is not expected to be reached under valid assumptions
#define UNREACHABLE() \ #define UNREACHABLE() \
(ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__), ASSERT(false)) (ERR("\t! Unreachable reached: %s(%d)", __FUNCTION__, __LINE__), ASSERT(false))
#endif // COMMON_DEBUG_H_ #endif // COMMON_DEBUG_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment