diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/util/thread.h | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/util/thread.h')
| -rw-r--r-- | src/util/thread.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util/thread.h b/src/util/thread.h index 949bb4204..6b2cf5b6c 100644 --- a/src/util/thread.h +++ b/src/util/thread.h @@ -120,7 +120,7 @@ class GetResult public: Key key; T item; - core::list<CallerInfo<Caller, CallerData> > callers; + std::list<CallerInfo<Caller, CallerData> > callers; }; template<typename Key, typename T, typename Caller, typename CallerData> @@ -152,16 +152,16 @@ public: Key key; ResultQueue<Key, T, Caller, CallerData> *dest; - core::list<CallerInfo<Caller, CallerData> > callers; + std::list<CallerInfo<Caller, CallerData> > callers; }; template<typename Key, typename T, typename Caller, typename CallerData> class RequestQueue { public: - u32 size() + bool empty() { - return m_queue.size(); + return m_queue.empty(); } void add(Key key, Caller caller, CallerData callerdata, @@ -172,17 +172,17 @@ public: /* If the caller is already on the list, only update CallerData */ - for(typename core::list< GetRequest<Key, T, Caller, CallerData> >::Iterator + for(typename std::list< GetRequest<Key, T, Caller, CallerData> >::iterator i = m_queue.getList().begin(); - i != m_queue.getList().end(); i++) + i != m_queue.getList().end(); ++i) { GetRequest<Key, T, Caller, CallerData> &request = *i; if(request.key == key) { - for(typename core::list< CallerInfo<Caller, CallerData> >::Iterator + for(typename std::list< CallerInfo<Caller, CallerData> >::iterator i = request.callers.begin(); - i != request.callers.end(); i++) + i != request.callers.end(); ++i) { CallerInfo<Caller, CallerData> &ca = *i; if(ca.caller == caller) |