diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-14 21:38:56 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-10-14 21:38:56 +0000 |
| commit | 1400380da58c59366f019c71392b288bbc3e3471 (patch) | |
| tree | 4f4c5f5edb7cb6ad1aa86c7c2080e0fe6737eb09 /ace/Object_Manager.cpp | |
| parent | c404b81103eee55f2179db238748b4d7503854fc (diff) | |
| download | ATCD-1400380da58c59366f019c71392b288bbc3e3471.tar.gz | |
use the static ACE_Static_Object_Lock even without ACE_HAS_NON_STATIC_OBJECT_MANAGER
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index bc43ad1806d..79e17605569 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -295,15 +295,15 @@ static ACE_Object_Manager_Destroyer ACE_Object_Manager_Destroyer_internal; ACE_Recursive_Thread_Mutex * ACE_Static_Object_Lock::instance (void) { -#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) +#if 1 // Temporary hack until we get rid of all statics from ACE library. // The ACE static services need this . . . static ACE_Recursive_Thread_Mutex _mutex; return &_mutex; -#else +#else /* ! 1 */ return ACE_Managed_Object<ACE_Recursive_Thread_Mutex>:: get_preallocated_object(ACE_Object_Manager::ACE_STATIC_OBJECT_LOCK); -#endif +#endif /* ! 1 */ } #endif /* ACE_HAS_THREADS */ |