OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-22 21:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #248 from lioncash/kernel

Browse Source 
Misc minor kernel-related changes.
This commit is contained in:
bunnei 2014-12-04 22:05:20 -05:00
commit 21d183e1e6
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/kernel/kernel.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include "common/common.h" #include "common/common.h"
#include "core/core.h" #include "core/core.h"
@ -37,7 +39,7 @@ Handle ObjectPool::Create(Object* obj, int range_bottom, int range_top) {
return 0; return 0;
} }
bool ObjectPool::IsValid(Handle handle) { bool ObjectPool::IsValid(Handle handle) const {
int index = handle - HANDLE_OFFSET; int index = handle - HANDLE_OFFSET;
if (index < 0) if (index < 0)
return false; return false;
@ -75,13 +77,8 @@ void ObjectPool::List() {
} }
} }
int ObjectPool::GetCount() { int ObjectPool::GetCount() const {
int count = 0; return std::count(occupied.begin(), occupied.end(), true);
for (int i = 0; i < MAX_COUNT; i++) {
if (occupied[i])
count++;
}
return count;
} }
Object* ObjectPool::CreateByIDType(int type) { Object* ObjectPool::CreateByIDType(int type) {

4
src/core/hle/kernel/kernel.h
View File

@ -86,7 +86,7 @@ public:
} }
} }
bool IsValid(Handle handle); bool IsValid(Handle handle) const;
template <class T> template <class T>
T* Get(Handle handle) { T* Get(Handle handle) {
@ -142,7 +142,7 @@ public:
Object* &operator [](Handle handle); Object* &operator [](Handle handle);
void List(); void List();
void Clear(); void Clear();
int GetCount(); int GetCount() const;
private: private: