From 9b68d5e07416882526b1d4d444a53f684274ca70 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 3 Dec 2014 19:48:34 -0500 Subject: kernel: Make some functions const --- src/core/hle/kernel/kernel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/kernel/kernel.cpp') diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 018000abd..2954f9913 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -37,7 +37,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,7 +75,7 @@ void ObjectPool::List() { } } -int ObjectPool::GetCount() { +int ObjectPool::GetCount() const { int count = 0; for (int i = 0; i < MAX_COUNT; i++) { if (occupied[i]) -- cgit v1.2.3 From 208598dbe28a7b403660e97f8841d5f5f68c7dd2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 3 Dec 2014 19:55:45 -0500 Subject: kernel: Shorten GetCount --- src/core/hle/kernel/kernel.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/core/hle/kernel/kernel.cpp') diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 2954f9913..80a34c2d5 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 + #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) { -- cgit v1.2.3