diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-06 13:23:58 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-06 13:23:58 +0000 |
| commit | ffe470de92d953c7977e8e8001d1554da5f8f6b8 (patch) | |
| tree | 266bfe53845124e869b1e1176ff7c6a238dff6d0 /ace/Object_Manager.cpp | |
| parent | de65b20a8b61f8a8bc4f22834c0237edff6155dc (diff) | |
| download | ATCD-ffe470de92d953c7977e8e8001d1554da5f8f6b8.tar.gz | |
ChangeLogTag: Fri Aug 06 08:22:00 1999 David L. Levine <levine@cs.wustl.edu>
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index e0ca10a5e78..94ec9afa053 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -777,18 +777,15 @@ static ACE_Object_Manager_Manager ACE_Object_Manager_Manager_instance; // This is global so that it doesn't have to be declared in the header // file. That would cause nasty circular include problems. +typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> + ACE_Static_Object_Lock_Type; +static ACE_Static_Object_Lock_Type * + ACE_Static_Object_Lock_lock = 0; + // ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK isn't (currently) used by ACE. // But, applications may find it useful for avoiding recursive calls // if they have overridden operator new. Thanks to Jody Hagins // <jody@atdesk.com> for contributing it. -# if defined(ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK) - typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> - ACE_Static_Object_Lock_Type; - ACE_Static_Object_Lock_Type * -# else /* ! ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK */ - static ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> * -# endif /* ! ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK */ - ACE_Static_Object_Lock_lock = 0; ACE_Recursive_Thread_Mutex * ACE_Static_Object_Lock::instance (void) |