diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-14 00:16:13 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-28 14:52:52 +0100 |
commit | 73fba22c019562687c6e14f20ca7422020f7e070 (patch) | |
tree | 605504e9e6306752023ce8bfbff9599c2eab957e /src/core/hle/kernel/kernel.h | |
parent | Merge pull request #349 from lioncash/uhdync (diff) | |
download | yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.gz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.bz2 yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.lz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.xz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.zst yuzu-73fba22c019562687c6e14f20ca7422020f7e070.zip |
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r-- | src/core/hle/kernel/kernel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 32258d5a0..20994b926 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -41,10 +41,10 @@ enum { DEFAULT_STACK_SIZE = 0x4000, }; -class ObjectPool; +class HandleTable; class Object : NonCopyable { - friend class ObjectPool; + friend class HandleTable; u32 handle; public: virtual ~Object() {} @@ -63,10 +63,10 @@ public: } }; -class ObjectPool : NonCopyable { +class HandleTable : NonCopyable { public: - ObjectPool(); - ~ObjectPool() {} + HandleTable(); + ~HandleTable() {} // Allocates a handle within the range and inserts the object into the map. Handle Create(Object* obj, int range_bottom=INITIAL_NEXT_ID, int range_top=0x7FFFFFFF); @@ -160,7 +160,7 @@ private: int next_id; }; -extern ObjectPool g_object_pool; +extern HandleTable g_handle_table; extern Handle g_main_thread; /// The ID code of the currently running game |