Removed some obsolete files & code, hacked IID_STUB_Object to work on

both NT and non-NT platforms, and made minor corrections on the manual
singleton implementation for TAO_OA_PARAMS.

1 files changed, 0 insertions, 42 deletions

diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 194490b38aa..2a1934bee36 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -171,45 +171,3 @@ TAO_OA_Parameters::singleton_lock_i (void)
   return TAO_OA_Parameters::ace_singleton_lock_;
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 }
-
-ACE_INLINE TAO_OA_Parameters *
-TAO_OA_Parameters::instance (void)
-{
-  ACE_TRACE ("TAO_OA_Parameters::instance");
-
-  TAO_OA_Parameters *&singleton = TAO_OA_Parameters::instance_i ();
-
-  // Perform the Double-Check pattern...
-  if (singleton == 0)
-    {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, (TAO_OA_Parameters::singleton_lock_i ()), 0);
-
-      if (singleton == 0)
-	ACE_NEW_RETURN (singleton, TAO_OA_Parameters, 0);
-    }
-
-  return singleton;
-}
-
-ACE_INLINE TAO_OA_Parameters *
-TAO_OA_Parameters::instance (TAO_OA_Parameters *new_instance)
-{
-  ACE_TRACE ("TAO_OA_Parameters::set_instance");
-
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, (TAO_OA_Parameters::singleton_lock_i ()), 0);
-
-  TAO_OA_Parameters *&singleton = TAO_OA_Parameters::instance_i ();
-  TAO_OA_Parameters *old_instance = singleton;
-  singleton = new_instance;
-
-  return old_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) */