diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-02-26 17:51:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 17:51:15 -0800 |
| commit | b250ce21b9a62cb573540fdb14f30c28fa66e6ad (patch) | |
| tree | ef55a0cd4a531a097de2152f563d712551972c4b /src/core/hle/kernel | |
| parent | f2ae2a7ff2a053d019985f70a2cc999c8d8bb844 (diff) | |
| parent | 174464a87f2e1709597bc1e0cb08c877487a771b (diff) | |
Merge pull request #2587 from yuriks/status-bar
Replace built-in Profiler with indicators in status bar
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/server_session.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/server_session.h b/src/core/hle/kernel/server_session.h index c088b9a19..4ffe97b78 100644 --- a/src/core/hle/kernel/server_session.h +++ b/src/core/hle/kernel/server_session.h @@ -4,6 +4,7 @@ #pragma once +#include <memory> #include <string> #include "common/assert.h" #include "common/common_types.h" diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index c557a2279..6ab31c70b 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -11,7 +11,6 @@ #include <boost/container/flat_set.hpp> #include "common/common_types.h" #include "core/arm/arm_interface.h" -#include "core/core.h" #include "core/hle/kernel/kernel.h" #include "core/hle/result.h" |