diff options
| author | 2014-06-06 00:10:50 -0400 | |
|---|---|---|
| committer | 2014-06-13 09:51:10 -0400 | |
| commit | 8cac527c943253a9471849d17b1520f4762fbb5c (patch) | |
| tree | d771a676b1e09657b336aece8d458c66fcce1601 /src/core | |
| parent | Core: Cleaned up SingleStep(), updated default LCD refresh to assume each ins... (diff) | |
| download | yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.gz yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.tar.xz yuzu-8cac527c943253a9471849d17b1520f4762fbb5c.zip | |
Kernel: Updated several member functions to be const
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/service.h | 4 |
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 { | |||
| 16 | 16 | ||
| 17 | class Event : public Object { | 17 | class Event : public Object { |
| 18 | public: | 18 | public: |
| 19 | const char* GetTypeName() { return "Event"; } | 19 | const char* GetTypeName() const { return "Event"; } |
| 20 | const char* GetName() { return name.c_str(); } | 20 | const char* GetName() const { return name.c_str(); } |
| 21 | 21 | ||
| 22 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; } | 22 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Event; } |
| 23 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Event; } | 23 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Event; } |
| 24 | 24 | ||
| 25 | ResetType intitial_reset_type; ///< ResetType specified at Event initialization | 25 | 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 { | |||
| 44 | public: | 44 | public: |
| 45 | virtual ~Object() {} | 45 | virtual ~Object() {} |
| 46 | Handle GetHandle() const { return handle; } | 46 | Handle GetHandle() const { return handle; } |
| 47 | virtual const char* GetTypeName() { return "[BAD KERNEL OBJECT TYPE]"; } | 47 | virtual const char* GetTypeName() const { return "[BAD KERNEL OBJECT TYPE]"; } |
| 48 | virtual const char* GetName() { return "[UNKNOWN KERNEL OBJECT]"; } | 48 | virtual const char* GetName() const { return "[UNKNOWN KERNEL OBJECT]"; } |
| 49 | virtual Kernel::HandleType GetHandleType() const = 0; | 49 | virtual Kernel::HandleType GetHandleType() const = 0; |
| 50 | 50 | ||
| 51 | /** | 51 | /** |
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 { | |||
| 15 | 15 | ||
| 16 | class Mutex : public Object { | 16 | class Mutex : public Object { |
| 17 | public: | 17 | public: |
| 18 | const char* GetTypeName() { return "Mutex"; } | 18 | const char* GetTypeName() const { return "Mutex"; } |
| 19 | const char* GetName() { return name.c_str(); } | 19 | const char* GetName() const { return name.c_str(); } |
| 20 | 20 | ||
| 21 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; } | 21 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; } |
| 22 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; } | 22 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Mutex; } |
| 23 | 23 | ||
| 24 | bool initial_locked; ///< Initial lock state when mutex was created | 24 | 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 { | |||
| 25 | class Thread : public Kernel::Object { | 25 | class Thread : public Kernel::Object { |
| 26 | public: | 26 | public: |
| 27 | 27 | ||
| 28 | const char* GetName() { return name; } | 28 | const char* GetName() const { return name; } |
| 29 | const char* GetTypeName() { return "Thread"; } | 29 | const char* GetTypeName() const { return "Thread"; } |
| 30 | 30 | ||
| 31 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; } | 31 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Thread; } |
| 32 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Thread; } | 32 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Thread; } |
| 33 | 33 | ||
| 34 | inline bool IsRunning() const { return (status & THREADSTATUS_RUNNING) != 0; } | 34 | 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 { | |||
| 39 | friend class Manager; | 39 | friend class Manager; |
| 40 | public: | 40 | public: |
| 41 | 41 | ||
| 42 | const char *GetName() { return GetPortName(); } | 42 | const char *GetName() const { return GetPortName(); } |
| 43 | const char *GetTypeName() { return GetPortName(); } | 43 | const char *GetTypeName() const { return GetPortName(); } |
| 44 | 44 | ||
| 45 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; } | 45 | static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Service; } |
| 46 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Service; } | 46 | Kernel::HandleType GetHandleType() const { return Kernel::HandleType::Service; } |