From 6f17a2416244ca12d9cb4a9b4eb48632685e74ce Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Fri, 25 Jun 2004 16:19:40 +0000
Subject: INTEGRATION: CWS tune04 (1.1.26); FILE MERGED 2004/06/15 07:23:36 cmc
 1.1.26.1: #i29636# turn global objects into local static data protected with
 swishy double-locked templated template

---
 basegfx/source/tuple/b3i64tuple.cxx | 15 +++++++++++----
 basegfx/source/tuple/b3ituple.cxx   | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'basegfx/source/tuple')

diff --git a/basegfx/source/tuple/b3i64tuple.cxx b/basegfx/source/tuple/b3i64tuple.cxx
index 5c413d01f995..f0f8c28db689 100644
--- a/basegfx/source/tuple/b3i64tuple.cxx
+++ b/basegfx/source/tuple/b3i64tuple.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3i64tuple.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: thb $ $Date: 2004-01-16 10:38:15 $
+ *  last change: $Author: hjs $ $Date: 2004-06-25 17:19:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,11 +62,18 @@
 #ifndef _BGFX_TUPLE_B3I64TUPLE_HXX
 #include <basegfx/tuple/b3i64tuple.hxx>
 #endif
+#ifndef INCLUDED_RTL_INSTANCE_HXX
+#include <rtl/instance.hxx>
+#endif
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B3I64Tuple, EmptyTuple> {}; }
 
 namespace basegfx
 {
-    // initialize static member
-    ::basegfx::B3I64Tuple B3I64Tuple::maEmptyTuple(0, 0, 0);
+    static const B3I64Tuple& getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
 } // end of namespace basegfx
 
 // eof
diff --git a/basegfx/source/tuple/b3ituple.cxx b/basegfx/source/tuple/b3ituple.cxx
index 70cc5e6df2e3..7a00f4de5218 100644
--- a/basegfx/source/tuple/b3ituple.cxx
+++ b/basegfx/source/tuple/b3ituple.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: b3ituple.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: thb $ $Date: 2004-01-16 10:37:59 $
+ *  last change: $Author: hjs $ $Date: 2004-06-25 17:19:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,11 +62,18 @@
 #ifndef _BGFX_TUPLE_B3ITUPLE_HXX
 #include <basegfx/tuple/b3ituple.hxx>
 #endif
+#ifndef INCLUDED_RTL_INSTANCE_HXX
+#include <rtl/instance.hxx>
+#endif
+
+namespace { struct EmptyTuple : public rtl::Static<basegfx::B3ITuple, EmptyTuple> {}; }
 
 namespace basegfx
 {
-    // initialize static member
-    ::basegfx::B3ITuple B3ITuple::maEmptyTuple(0, 0, 0);
+    static const B3ITuple& getEmptyTuple()
+    {
+        return EmptyTuple::get();
+    }
 } // end of namespace basegfx
 
 // eof
-- 
cgit