summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-06-06 06:10:50 +0200
committerbunnei <ericbunnie@gmail.com>2014-06-13 15:51:10 +0200
commit8cac527c943253a9471849d17b1520f4762fbb5c (patch)
treed771a676b1e09657b336aece8d458c66fcce1601
parentCore: Cleaned up SingleStep(), updated default LCD refresh to assume each instruction is ~3 cycles (diff)
downloadyuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar
yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.gz
yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.bz2
yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.lz
yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.xz
yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.zst
yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.zip
-rw-r--r--src/core/hle/kernel/event.cpp6
-rw-r--r--src/core/hle/kernel/kernel.h4
-rw-r--r--src/core/hle/kernel/mutex.cpp6
-rw-r--r--src/core/hle/kernel/thread.cpp6
-rw-r--r--src/core/hle/service/service.h4
5 files changed, 13 insertions, 13 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 36c7dcbc8..72a190f8c 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -16,10 +16,10 @@ namespace Kernel {
class Event : public Object {
public:
- const char* GetTypeName() { return "Event"; }
- const char* GetName() { return name.c_str(); }
+ const char* GetTypeName() const { return "Event"; }
+ const char* GetName() const { return name.c_str(); }
- static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; }
+ static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Event; }
ResetType intitial_reset_type; ///< ResetType specified at Event initialization
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index f1bb78801..d2d624f6d 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -44,8 +44,8 @@ class Object : NonCopyable {
public:
virtual ~Object() {}
Handle GetHandle() const { return handle; }
- virtual const char* GetTypeName() { return "[BAD KERNEL OBJECT TYPE]"; }
- virtual const char* GetName() { return "[UNKNOWN KERNEL OBJECT]"; }
+ virtual const char* GetTypeName() const { return "[BAD KERNEL OBJECT TYPE]"; }
+ virtual const char* GetName() const { return "[UNKNOWN KERNEL OBJECT]"; }
virtual Kernel::HandleType GetHandleType() const = 0;
/**
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 133c43079..9d909ea01 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -15,10 +15,10 @@ namespace Kernel {
class Mutex : public Object {
public:
- const char* GetTypeName() { return "Mutex"; }
- const char* GetName() { return name.c_str(); }
+ const char* GetTypeName() const { return "Mutex"; }
+ const char* GetName() const { return name.c_str(); }
- static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; }
+ static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; }
bool initial_locked; ///< Initial lock state when mutex was created
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 6196c352c..da93e006c 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -25,10 +25,10 @@ namespace Kernel {
class Thread : public Kernel::Object {
public:
- const char* GetName() { return name; }
- const char* GetTypeName() { return "Thread"; }
+ const char* GetName() const { return name; }
+ const char* GetTypeName() const { return "Thread"; }
- static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; }
+ static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Thread; }
inline bool IsRunning() const { return (status & THREADSTATUS_RUNNING) != 0; }
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 8699ad305..4b5c5b3c8 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -39,8 +39,8 @@ class Interface : public Kernel::Object {
friend class Manager;
public:
- const char *GetName() { return GetPortName(); }
- const char *GetTypeName() { return GetPortName(); }
+ const char *GetName() const { return GetPortName(); }
+ const char *GetTypeName() const { return GetPortName(); }
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; }
Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Service; }