Reverted some Win64 gcc 4.8 related stuff as we are on gcc4.9 now, Issue 2708

2015-03-09 15:01:37 +01:00
parent b5a7896aca
commit 1aa2ae3903
5 changed files with 7 additions and 7 deletions
--- a/rtgui/thumbimageupdater.cc
+++ b/rtgui/thumbimageupdater.cc
@@ -68,11 +68,11 @@ public:
 		active_(0),
 		inactive_waiting_(false)
 	{
-		int threadCount=1;
-#if !(defined( WIN32 ) && defined( __x86_64__ ))
+		int threadCount = 1;
+#if !(__GNUC__ == 4 && __GNUC_MINOR__ == 8 && defined( WIN32 ) && defined(__x86_64__))
 		// See Issue 2431 for explanation
 		#ifdef _OPENMP
-			threadCount=omp_get_num_procs();
+			threadCount = omp_get_num_procs();
 		#endif
 #endif