[Loki-lib-cvs] SF.net SVN: loki-lib:[1119] trunk/include/loki/ThreadLocal.h

[<ric...@us...>]

Revision: 1119
          http://loki-lib.svn.sourceforge.net/loki-lib/?rev=1119&view=rev
Author:   rich_sposato
Date:     2011-09-29 20:40:13 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Changed check for GCC version 4.4

Modified Paths:
--------------
    trunk/include/loki/ThreadLocal.h

Modified: trunk/include/loki/ThreadLocal.h
===================================================================
--- trunk/include/loki/ThreadLocal.h	2011-09-29 20:36:38 UTC (rev 1118)
+++ trunk/include/loki/ThreadLocal.h	2011-09-29 20:40:13 UTC (rev 1119)
@@ -34,25 +34,28 @@
 // macro which allows compiler to see the code inside this file.
 // Then #undef the macro for compilers which do not support thread-local
 // storage or do not implement it correctly.
-#define LOKI_THINKS_COMPILER_ALLOWS_THREAD_LOCAL_STORAGE 1
+#define LOKI_THINKS_COMPILER_ALLOWS_THREAD_LOCAL_STORAGE 1
 
 #if defined( __GNUC__ )
     // The __APPLE__ macro does not refer to a compiler, but to the Apple OSX operating system.
     #if defined( __APPLE__ )
         #warning "GCC for Apple does not allow thread_local storage, so you can not use some parts of Loki."
-        #undef COMPILER_ALLOWS_THREAD_LOCAL_STORAGE
+        #undef LOKI_THINKS_COMPILER_ALLOWS_THREAD_LOCAL_STORAGE
 
     #elif defined( __CYGWIN__ )
         #if ( __GNUC__ <= 3 )
             #warning "Older versions of GCC for Cygwin do not allow thread_local storage, so you can not use some parts of Loki."
-            #undef COMPILER_ALLOWS_THREAD_LOCAL_STORAGE
+            #undef LOKI_THINKS_COMPILER_ALLOWS_THREAD_LOCAL_STORAGE
         #endif
 
     #elif ( __GNUC__ == 4 ) // GNU versions other than Cygwin.
-        #if ( __GNUC_MINOR__ == 4 )
-            #warning "GCC version 4.4 implements thread_local storage incorrectly, so you can not use some parts of Loki."
-            #undef COMPILER_ALLOWS_THREAD_LOCAL_STORAGE
-        #endif
+        #if ( __GNUC_MINOR__ < 4 )
+            #warning "GCC versions before 4.4 implement thread_local storage incorrectly, so you can not use some parts of Loki."
+            #undef LOKI_THINKS_COMPILER_ALLOWS_THREAD_LOCAL_STORAGE
+        #elif ( __GNUC_MINOR__ == 4 )
+            #warning "GCC version 4.4 implements thread_local storage incorrectly for some platforms but not others."
+        #endif
+
     #endif
 #endif
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.