diff options
| author |  bunnei | 2016-04-24 02:02:45 -0400 |
|---|---|---|
| committer | bunnei | 2016-04-24 02:02:45 -0400 |
| commit | 0964a3ff530f2eb5b7ecdf9dfbb74deea890352d (patch) | |
| tree | c566efaf69f8d3564d1e678a0a31981a52794a8a /src/common | |
| parent | Merge pull request #1705 from LittleWhite-tb/compat_gcc49 (diff) | |
| parent | assert: Add _MSG variations for UNREACHABLE and UNIMPLEMENTED (diff) | |
| download | yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.gz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.xz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.zip | |
Merge pull request #1576 from smspillaz/fix-build-errors-03272016
Fix various build errors encountered on Clang 3.9 on OS X
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/assert.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/assert.h b/src/common/assert.h index 6849778b7..d7f19f5eb 100644 --- a/src/common/assert.h +++ b/src/common/assert.h | |||
| @@ -39,6 +39,7 @@ static void assert_noinline_call(const Fn& fn) { | |||
| 39 | }); } while (0) | 39 | }); } while (0) |
| 40 | 40 | ||
| 41 | #define UNREACHABLE() ASSERT_MSG(false, "Unreachable code!") | 41 | #define UNREACHABLE() ASSERT_MSG(false, "Unreachable code!") |
| 42 | #define UNREACHABLE_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__) | ||
| 42 | 43 | ||
| 43 | #ifdef _DEBUG | 44 | #ifdef _DEBUG |
| 44 | #define DEBUG_ASSERT(_a_) ASSERT(_a_) | 45 | #define DEBUG_ASSERT(_a_) ASSERT(_a_) |
| @@ -49,3 +50,4 @@ static void assert_noinline_call(const Fn& fn) { | |||
| 49 | #endif | 50 | #endif |
| 50 | 51 | ||
| 51 | #define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!") | 52 | #define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!") |
| 53 | #define UNIMPLEMENTED_MSG(_a_, ...) ASSERT_MSG(false, _a_, __VA_ARGS__) \ No newline at end of file | ||