[Libreoffice-commits] .: sal/inc

[Stephan Bergmann]

 sal/inc/rtl/instance.hxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3073b539d28a4ea29347e8060e19dda080c5d13b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 14 12:32:54 2012 +0100

    Make code exploiting -fthreadsafe-statics properly conditional
    
    Looks like 979e2c8f8b9325a5c75bfc1f388aa8f69b988d2c missed these.

diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx
index 943a449..9520dac 100644
--- a/sal/inc/rtl/instance.hxx
+++ b/sal/inc/rtl/instance.hxx
@@ -446,7 +446,7 @@ private:
               using the outer class
               (the one that derives from this base class)
 */
-#if (__GNUC__ >= 4)
+#if defined HAVE_THREADSAFE_STATICS
 template<typename T, typename Data, typename Unique>
 class StaticWithArg {
 public:
@@ -528,7 +528,7 @@ private:
     @tparam InitAggregate
               initializer functor class
 */
-#if (__GNUC__ >= 4)
+#if defined HAVE_THREADSAFE_STATICS
 template<typename T, typename InitAggregate>
 class StaticAggregate {
 public:
@@ -593,7 +593,7 @@ public:
               Initializer functor's return type.
               Default is T (common practice).
 */
-#if (__GNUC__ >= 4)
+#if defined HAVE_THREADSAFE_STATICS
 template<typename T, typename InitData,
          typename Unique = InitData, typename Data = T>
 class StaticWithInit {