oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Migrate to STL containers/algorithms.

Browse source
This commit is contained in:
Ilya Zhuravlev 2012-12-20 21:19:49 +04:00 • committed by kwolekr
parent e204bedf1d
commit 6a1670dbc3
63 changed files with 1330 additions and 1417 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/util/thread.h
View file

@ -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)