aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash <mathew1800@gmail.com>2014-12-03 19:55:45 -0500
committerGravatar Lioncash <mathew1800@gmail.com>2014-12-03 22:52:02 -0500
commit208598dbe28a7b403660e97f8841d5f5f68c7dd2 (patch)
tree12f2fa3e83c0bf7b7768a15b63dfdd3f70fed9e8 /src/core/hle/kernel/kernel.cpp
parent9b68d5e07416882526b1d4d444a53f684274ca70 (diff)
kernel: Shorten GetCount
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 2954f991..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"
@@ -76,12 +78,7 @@ void ObjectPool::List() {
}
int ObjectPool::GetCount() const {
- int count = 0;
- for (int i = 0; i < MAX_COUNT; i++) {
- if (occupied[i])
- count++;
- }
- return count;
+ return std::count(occupied.begin(), occupied.end(), true);
}
Object* ObjectPool::CreateByIDType(int type) {