SDL2: Compile fix

--HG--
branch : sdl2
hg/feature/sdl2
kaetemi 11 years ago
parent ff1059f735
commit 23cbacc0c9

@ -69,7 +69,7 @@ public:
} }
}; };
/// Thread priorities, numbering follows Win32 for now /// Thread priorities
enum TThreadPriority enum TThreadPriority
{ {
ThreadPriorityLow, ThreadPriorityLow,

@ -180,7 +180,7 @@ public:
for (i=0; i<NumThreads; ++i) for (i=0; i<NumThreads; ++i)
{ {
IRunnable *runnable = (IRunnable *)(new CPinger()); IRunnable *runnable = (IRunnable *)(new CPinger());
IThread *thread = IThread::create(runnable); CThread *thread = CThread::create(runnable);
thread->start(); thread->start();
} }
} }

@ -140,7 +140,7 @@ CBufFIFO *CurrentReadQueue = NULL;
TReceivedMessage *CurrentInMsg = NULL; TReceivedMessage *CurrentInMsg = NULL;
IThread *ReceiveThread = NULL; CThread *ReceiveThread = NULL;
CReceiveTask *ReceiveTask = NULL; CReceiveTask *ReceiveTask = NULL;
list<CClient> Clients; // contains all clients list<CClient> Clients; // contains all clients
@ -649,7 +649,7 @@ public:
CurrentReadQueue = &Queue2; CurrentReadQueue = &Queue2;
ReceiveTask->setWriteQueue( &Queue1 ); ReceiveTask->setWriteQueue( &Queue1 );
nlassert( ReceiveTask != NULL ); nlassert( ReceiveTask != NULL );
ReceiveThread = IThread::create( ReceiveTask ); ReceiveThread = CThread::create( ReceiveTask );
nlassert( ReceiveThread != NULL ); nlassert( ReceiveThread != NULL );
ReceiveThread->start(); ReceiveThread->start();

@ -159,7 +159,7 @@ public:
result2.clear(); result2.clear();
CTaskThread tt; CTaskThread tt;
NLMISC::IThread *th = NLMISC::IThread::create(&tt); NLMISC::CThread *th = NLMISC::CThread::create(&tt);
CTask2 t2; CTask2 t2;

@ -615,7 +615,7 @@ void startPatchThread (const std::string &serverPath, const std::string &serverV
PatchThread = new CPatchThread (serverPath, serverVersion, urlOk, urlFailed, logSeparator); PatchThread = new CPatchThread (serverPath, serverVersion, urlOk, urlFailed, logSeparator);
nlassert (PatchThread != NULL); nlassert (PatchThread != NULL);
IThread *thread = IThread::create (PatchThread); CThread *thread = CThread::create (PatchThread);
nlassert (thread != NULL); nlassert (thread != NULL);
thread->start (); thread->start ();
} }

@ -777,7 +777,7 @@ void startPatchThread (const std::string &serverPath, const std::string &serverV
PatchThread = new CPatchThread (serverPath, serverVersion, urlOk, urlFailed, logSeparator); PatchThread = new CPatchThread (serverPath, serverVersion, urlOk, urlFailed, logSeparator);
nlassert (PatchThread != NULL); nlassert (PatchThread != NULL);
IThread *thread = IThread::create (PatchThread); CThread *thread = CThread::create (PatchThread);
nlassert (thread != NULL); nlassert (thread != NULL);
thread->start (); thread->start ();
} }

@ -917,7 +917,7 @@ public:
}; };
CPatchThread *PatchThread = NULL; CPatchThread *PatchThread = NULL;
IThread *thread = NULL; CThread *thread = NULL;
int myProgressFunc(void *foo, double t, double d, double ultotal, double ulnow) int myProgressFunc(void *foo, double t, double d, double ultotal, double ulnow)
{ {
@ -940,7 +940,7 @@ void startPatchThread (const std::string &serverPath, const std::string &serverV
PatchThread = new CPatchThread (serverPath, serverVersion, urlOk, urlFailed, logSeparator); PatchThread = new CPatchThread (serverPath, serverVersion, urlOk, urlFailed, logSeparator);
nlassert (PatchThread != NULL); nlassert (PatchThread != NULL);
thread = IThread::create (PatchThread); thread = CThread::create (PatchThread);
nlassert (thread != NULL); nlassert (thread != NULL);
thread->start (); thread->start ();
} }

@ -144,7 +144,7 @@ private:
private: private:
// data for the singleton instance // data for the singleton instance
CStdinMonitorThread* _StdinMonitorThreadInstance; CStdinMonitorThread* _StdinMonitorThreadInstance;
NLMISC::IThread* _StdinMonitorThreadHandle; NLMISC::CThread* _StdinMonitorThreadHandle;
}; };
CStdinMonitorSingleton StdinMonitorSingleton; CStdinMonitorSingleton StdinMonitorSingleton;
@ -165,7 +165,7 @@ static CStdinMonitorSingleton& getInstance()
void CStdinMonitorSingleton::init() void CStdinMonitorSingleton::init()
{ {
_StdinMonitorThreadInstance= new CStdinMonitorThread; _StdinMonitorThreadInstance= new CStdinMonitorThread;
_StdinMonitorThreadHandle = NLMISC::IThread::create (_StdinMonitorThreadInstance); _StdinMonitorThreadHandle = NLMISC::CThread::create (_StdinMonitorThreadInstance);
_StdinMonitorThreadHandle->start(); _StdinMonitorThreadHandle->start();
} }

@ -363,7 +363,7 @@ void CPatchManager::startScanDataThread()
ScanDataThread = new CScanDataThread(); ScanDataThread = new CScanDataThread();
nlassert (ScanDataThread != NULL); nlassert (ScanDataThread != NULL);
thread = IThread::create (ScanDataThread); thread = CThread::create (ScanDataThread);
nlassert (thread != NULL); nlassert (thread != NULL);
thread->start (); thread->start ();
} }

@ -143,7 +143,7 @@ private:
// Threads // Threads
CScanDataThread *ScanDataThread; CScanDataThread *ScanDataThread;
NLMISC::IThread *thread; NLMISC::CThread *thread;
// State // State
struct CState struct CState

Loading…
Cancel
Save