summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/thread.h
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2016-12-08 16:34:53 +0100
committerSubv <subv2112@gmail.com>2016-12-09 18:23:09 +0100
commit17b29d8865ea4d96c18f7e1671bd6d0f01eab95f (patch)
tree20137ff3eed145ae36db64ccf4b54cf37384c82c /src/core/hle/kernel/thread.h
parentUse boost remove_erase_if instead of the erase-remove idiom (diff)
downloadyuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.tar
yuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.tar.gz
yuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.tar.bz2
yuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.tar.lz
yuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.tar.xz
yuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.tar.zst
yuzu-17b29d8865ea4d96c18f7e1671bd6d0f01eab95f.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/thread.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 1b29fb3a3..4c254cb9d 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -7,6 +7,7 @@
#include <string>
#include <unordered_map>
#include <vector>
+#include <boost/container/flat_map.hpp>
#include <boost/container/flat_set.hpp>
#include "common/common_types.h"
#include "core/core.h"
@@ -153,7 +154,7 @@ public:
* its wait list to become ready, as a result of a WaitSynchronizationN call
* with wait_all = true, or a ReplyAndReceive call.
*/
- bool IsWaitingAll() const {
+ bool IsSleepingOnWaitAll() const {
return !wait_objects.empty();
}
@@ -183,7 +184,7 @@ public:
/// This is only populated when the thread should wait for all the objects to become ready.
std::vector<SharedPtr<WaitObject>> wait_objects;
- std::unordered_map<int, s32> wait_objects_index; ///< Mapping of Object ids to their position in the last waitlist that this object waited on.
+ boost::container::flat_map<int, s32> wait_objects_index; ///< Mapping of Object ids to their position in the last waitlist that this object waited on.
VAddr wait_address; ///< If waiting on an AddressArbiter, this is the arbitration address