Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes for Android+boost

Browse Source
This commit is contained in:
Xawotihs
2011-11-16 20:49:26 +00:00
parent ee700623d5
commit 8a1606a3c6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/TestSuiteAI.h
+1 -1
View File
@@ -81,7 +81,7 @@ private:
string files[1024]; string files[1024];
void cleanup(); void cleanup();
vector<boost::thread> mWorkerThread; vector<boost::thread*> mWorkerThread;
Rules* mRules; Rules* mRules;
bool mProcessing; bool mProcessing;
projects/mtg/src/TestSuiteAI.cpp
+9 -3
View File
@@ -452,7 +452,8 @@ TestSuite::~TestSuite()
mProcessing = false; mProcessing = false;
while(mWorkerThread.size()) while(mWorkerThread.size())
{ {
mWorkerThread.back().join(); mWorkerThread.back()->join();
SAFE_DELETE(mWorkerThread.back());
mWorkerThread.pop_back(); mWorkerThread.pop_back();
} }
@@ -545,13 +546,18 @@ int TestSuite::loadNext()
if(!mProcessing) if(!mProcessing)
{ // "I don't like to wait" mode { // "I don't like to wait" mode
mProcessing = true; mProcessing = true;
mWorkerThread.clear(); while(mWorkerThread.size())
{
mWorkerThread.back()->join();
SAFE_DELETE(mWorkerThread.back());
mWorkerThread.pop_back();
}
size_t thread_count = 1; size_t thread_count = 1;
#ifdef QT_CONFIG #ifdef QT_CONFIG
thread_count = QThread::idealThreadCount(); thread_count = QThread::idealThreadCount();
#endif #endif
for(size_t i = 0; i < (thread_count-1); i++) for(size_t i = 0; i < (thread_count-1); i++)
mWorkerThread.push_back(boost::thread(ThreadProc, this)); mWorkerThread.push_back(new boost::thread(ThreadProc, this));
} }
cleanup(); cleanup();