diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-23 13:58:46 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-23 13:58:46 +0000 |
| commit | 49fe3196e42ee10e106840ab851f0d48b2acd718 (patch) | |
| tree | 7d834884b974aba80def904366b86bdf7fd95f24 /ace/Singleton.cpp | |
| parent | 72c84f9d89e25a7cda222ac93c0a031af6526811 (diff) | |
| download | ATCD-49fe3196e42ee10e106840ab851f0d48b2acd718.tar.gz | |
disable GUARD until Object_Manager singleton are sorted out
Diffstat (limited to 'ace/Singleton.cpp')
| -rw-r--r-- | ace/Singleton.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp index 69de717c1de..28b9d23a5de 100644 --- a/ace/Singleton.cpp +++ b/ace/Singleton.cpp @@ -70,11 +70,14 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void) // Use the Object_Manager's preallocated lock. ACE_LOCK *lock = ACE_Object_Manager::get_singleton_lock ((ACE_LOCK *) 0); +#if 0 // ???? HACK! Don't guard until singleton lock issue is resolved! ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0); +#endif // 0 if (singleton == 0) { - ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0); + ACE_NEW_RETURN (singleton, + (ACE_Singleton<TYPE, ACE_LOCK>), 0); // Register for destruction with ACE_Object_Manager. ACE_Object_Manager::at_exit (singleton); @@ -157,7 +160,9 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void) // Use the Object_Manager's preallocated lock. ACE_LOCK *lock = ACE_Object_Manager::get_singleton_lock ((ACE_LOCK *) 0); +#if 0 // ???? HACK! Don't guard until singleton lock issue is resolved! ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0); +#endif // 0 if (singleton == 0) { |