fly/terragear
1
0
Fork 0
Code Activity

Fix a namespace collision under Windows

Browse source
This commit is contained in:
Frederic Bouvier 2013-01-06 00:20:00 +01:00
parent 75519f886a
commit 29e10a7314
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/BuildTiles/Main/main.cxx
View file

@ -24,7 +24,9 @@
#ifdef _MSC_VER #ifdef _MSC_VER
# include <windows.h> # include <windows.h>
# define sleep(x) Sleep(x*1000) # define tgSleep(x) Sleep(x*1000)
#else
# define tgSleep(x) sleep(x)
#endif #endif
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -222,7 +224,7 @@ int main(int argc, char **argv) {
} }
// wait for workqueue to empty // wait for workqueue to empty
while( wq[0].size() ) { while( wq[0].size() ) {
sleep( 5 ); tgSleep( 5 );
} }
// wait for all threads to complete // wait for all threads to complete
for (unsigned int i=0; i<constructs.size(); i++) { for (unsigned int i=0; i<constructs.size(); i++) {
@ -250,7 +252,7 @@ int main(int argc, char **argv) {
} }
// wait for workqueue to empty // wait for workqueue to empty
while( wq[1].size() ) { while( wq[1].size() ) {
sleep( 5 ); tgSleep( 5 );
} }
// wait for all threads to complete // wait for all threads to complete
for (unsigned int i=0; i<constructs.size(); i++) { for (unsigned int i=0; i<constructs.size(); i++) {
@ -277,7 +279,7 @@ int main(int argc, char **argv) {
} }
// wait for workqueue to empty // wait for workqueue to empty
while( wq[2].size() ) { while( wq[2].size() ) {
sleep( 5 ); tgSleep( 5 );
} }
// wait for all threads to complete // wait for all threads to complete
for (unsigned int i=0; i<constructs.size(); i++) { for (unsigned int i=0; i<constructs.size(); i++) {