real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Removed a compile warning and changed scheduler's "tasks to cancel" set to a hash set.

Browse Source 
This was SVN commit r3273.
This commit is contained in:
Matei 2005-12-18 07:41:02 +00:00
parent 5e0e3c32f3
commit 709d1389da
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/scripting/ScriptGlue.cpp
View File

@ -264,7 +264,7 @@ JSBool RemoveGlobalHandler( JSContext* cx, JSObject* UNUSED(obj), uint argc, jsv
// The called function or script executes in the same scope as the
// code that called setTimeout (amongst other things, the
// 'this' reference is usually maintained)
JSBool setTimeout( JSContext* cx, JSObject* obj, uint argc, jsval* argv, jsval* rval )
JSBool setTimeout( JSContext* cx, JSObject*, uint argc, jsval* argv, jsval* rval )
{
REQUIRE_MIN_PARAMS(2, setTimeout);
REQUIRE_MAX_PARAMS(3, setTimeout);

2
source/simulation/Scheduler.h
View File

@ -67,7 +67,7 @@ struct CScheduler : public Singleton<CScheduler>
std::list<CJSProgressTimer*> progressTimers;
int m_nextTaskId;
bool m_abortInterval;
std::set<int> tasksToCancel;
STL_HASH_SET<int> tasksToCancel;
CScheduler();
int pushTime( size_t delay, const CStrW& fragment, JSObject* operateOn = NULL );