3 files changed, 1 insertions, 21 deletions
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 846c14c75ed..47720dc1782 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -36,13 +36,11 @@ TAO_OA_Parameters::instance (TAO_OA_Parameters *new_instance)
 }
 
 
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
 // Pointer to the Singleton instance.
 TAO_OA_Parameters *TAO_OA_Parameters::instance_ = 0;
 
 // Lock the creation of the singleton.  
 ACE_SYNCH_MUTEX TAO_OA_Parameters::ace_singleton_lock_;
-#endif /* !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) */
 
 #if !defined(__ACE_INLINE__)
 #  include "params.i"
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index 4ee9d9bc02f..3abc560d180 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -139,13 +139,11 @@ public:
   CORBA_ULong tablesize (void);
 
 protected:
-#if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
   static TAO_OA_Parameters *instance_;
   // Pointer to the Singleton instance.
 
-  static TAO_OA_Parameters ace_singleton_lock_;
+  static ACE_SYNCH_MUTEX ace_singleton_lock_;
   // Lock the creation of the singleton.  
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   static TAO_OA_Parameters *&instance_i (void);
   // Get pointer to the Singleton instance
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 2a1934bee36..dd1933c89b4 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -147,27 +147,11 @@ TAO_OA_Parameters::tablesize (void)
 ACE_INLINE TAO_OA_Parameters *&
 TAO_OA_Parameters::instance_i (void)
 {
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // Pointer to the Singleton instance.  This works around a bug with
-  // G++...
-  static TAO_OA_Parameters *instance_ = 0;
-
-  return instance_;
-#else
   return TAO_OA_Parameters::instance_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }
 
 ACE_INLINE ACE_SYNCH_MUTEX &
 TAO_OA_Parameters::singleton_lock_i (void)
 {
-#if defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
-  // ACE_SYNCH_MUTEX the creation of the singleton.  This works around a
-  // "feature" of G++... ;-)
-  static ACE_SYNCH_MUTEX ace_singleton_lock_;
-
-  return ace_singleton_lock_;
-#else
   return TAO_OA_Parameters::ace_singleton_lock_;
-#endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }