diff options
| author | archshift <admin@archshift.com> | 2015-01-20 17:16:47 -0800 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2015-02-10 18:30:31 -0800 |
| commit | ef24e72b2618806f64345544fa46c84f3f494890 (patch) | |
| tree | fca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/core/hle/kernel/timer.cpp | |
| parent | 168eb27aee7992b8abf9f505b8c246a25fc8dca5 (diff) | |
Asserts: break/crash program, fit to style guide; log.h->assert.h
Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time)
As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing)
Also removed some GEKKO cruft.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 4352fc99c9..aa0afb796d 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -38,7 +38,7 @@ bool Timer::ShouldWait() { } void Timer::Acquire() { - _assert_msg_(Kernel, !ShouldWait(), "object unavailable!"); + ASSERT_MSG( !ShouldWait(), "object unavailable!"); } void Timer::Set(s64 initial, s64 interval) { |