diff options
| author | 2014-12-13 21:16:13 -0200 | |
|---|---|---|
| committer | 2014-12-28 11:52:52 -0200 | |
| commit | 73fba22c019562687c6e14f20ca7422020f7e070 (patch) | |
| tree | 605504e9e6306752023ce8bfbff9599c2eab957e /src/core/hle/kernel/kernel.h | |
| parent | Merge pull request #349 from lioncash/uhdync (diff) | |
| download | yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.gz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.tar.xz yuzu-73fba22c019562687c6e14f20ca7422020f7e070.zip | |
Rename ObjectPool to HandleTable
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 { | |||
| 41 | DEFAULT_STACK_SIZE = 0x4000, | 41 | DEFAULT_STACK_SIZE = 0x4000, |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | class ObjectPool; | 44 | class HandleTable; |
| 45 | 45 | ||
| 46 | class Object : NonCopyable { | 46 | class Object : NonCopyable { |
| 47 | friend class ObjectPool; | 47 | friend class HandleTable; |
| 48 | u32 handle; | 48 | u32 handle; |
| 49 | public: | 49 | public: |
| 50 | virtual ~Object() {} | 50 | virtual ~Object() {} |
| @@ -63,10 +63,10 @@ public: | |||
| 63 | } | 63 | } |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | class ObjectPool : NonCopyable { | 66 | class HandleTable : NonCopyable { |
| 67 | public: | 67 | public: |
| 68 | ObjectPool(); | 68 | HandleTable(); |
| 69 | ~ObjectPool() {} | 69 | ~HandleTable() {} |
| 70 | 70 | ||
| 71 | // Allocates a handle within the range and inserts the object into the map. | 71 | // Allocates a handle within the range and inserts the object into the map. |
| 72 | Handle Create(Object* obj, int range_bottom=INITIAL_NEXT_ID, int range_top=0x7FFFFFFF); | 72 | Handle Create(Object* obj, int range_bottom=INITIAL_NEXT_ID, int range_top=0x7FFFFFFF); |
| @@ -160,7 +160,7 @@ private: | |||
| 160 | int next_id; | 160 | int next_id; |
| 161 | }; | 161 | }; |
| 162 | 162 | ||
| 163 | extern ObjectPool g_object_pool; | 163 | extern HandleTable g_handle_table; |
| 164 | extern Handle g_main_thread; | 164 | extern Handle g_main_thread; |
| 165 | 165 | ||
| 166 | /// The ID code of the currently running game | 166 | /// The ID code of the currently running game |