diff options
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 88a6cb502aa..f3bec50b9ff 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -112,9 +112,9 @@ private: // We can't use the ACE_SVC_FACTORY_DECLARE macro here because this // needs to be in the ACE_Export context rather than the // ACE_Svc_Export context. -extern "C" ACE_Export -ACE_Service_Object * -_make_ACE_Service_Manager (ACE_Service_Object_Exterminator *); +//extern "C" ACE_Export +//ACE_Service_Object * +//_make_ACE_Service_Manager (ACE_Service_Object_Exterminator *); ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) { @@ -767,12 +767,13 @@ static ACE_Object_Manager_Manager ACE_Object_Manager_Manager_instance; #if defined (ACE_HAS_THREADS) +// hack to get around errors while compiling using split-cpp +#if !defined (ACE_IS_SPLITTING) // 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; +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; +#endif /* ! ACE_IS_SPLITTING */ // ACE_SHOULD_MALLOC_STATIC_OBJECT_LOCK isn't (currently) used by ACE. // But, applications may find it useful for avoiding recursive calls |