diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-04 22:05:20 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-04 22:05:20 -0500 |
commit | 21d183e1e6ddc93960a7f7f049e74d3b51186ddc (patch) | |
tree | 38f2ebba41950b1604f5a369316d6d0d5a925494 /src/core/hle/kernel/kernel.cpp | |
parent | 846dc72a37bb3651b8c40c9d474c381298aff902 (diff) | |
parent | 208598dbe28a7b403660e97f8841d5f5f68c7dd2 (diff) |
Merge pull request #248 from lioncash/kernel
Misc minor kernel-related changes.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 018000ab..80a34c2d 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include <algorithm> + #include "common/common.h" #include "core/core.h" @@ -37,7 +39,7 @@ Handle ObjectPool::Create(Object* obj, int range_bottom, int range_top) { return 0; } -bool ObjectPool::IsValid(Handle handle) { +bool ObjectPool::IsValid(Handle handle) const { int index = handle - HANDLE_OFFSET; if (index < 0) return false; @@ -75,13 +77,8 @@ void ObjectPool::List() { } } -int ObjectPool::GetCount() { - int count = 0; - for (int i = 0; i < MAX_COUNT; i++) { - if (occupied[i]) - count++; - } - return count; +int ObjectPool::GetCount() const { + return std::count(occupied.begin(), occupied.end(), true); } Object* ObjectPool::CreateByIDType(int type) { |