aboutsummaryrefslogtreecommitdiff
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-02-10 23:08:04 -0500
committerbunnei <bunneidev@gmail.com>2015-02-10 23:08:04 -0500
commit2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f (patch)
treefca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/core/core_timing.cpp
parent168eb27aee7992b8abf9f505b8c246a25fc8dca5 (diff)
parentef24e72b2618806f64345544fa46c84f3f494890 (diff)
Merge pull request #500 from archshift/assert
Made asserts actually break the debugger, or crash if the program is not in debug mode.
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 3aebd7e9dd..d96d3fe168 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -7,8 +7,8 @@
#include <mutex>
#include <vector>
+#include "common/assert.h"
#include "common/chunk_file.h"
-#include "common/log.h"
#include "core/arm/arm_interface.h"
#include "core/core.h"