diff options
| author | agg1 <agg1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-25 02:29:28 +0000 |
|---|---|---|
| committer | agg1 <agg1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-25 02:29:28 +0000 |
| commit | 091fbb2d3d94bb0a724f2d3639c1f51e707ff6e1 (patch) | |
| tree | b45ed5606c3d19263b6fe323b7bb43761270741d /ace/Object_Manager.h | |
| parent | 4a44ea2c64dfdb3ee0f4c42d1050462976c0224f (diff) | |
| download | ATCD-091fbb2d3d94bb0a724f2d3639c1f51e707ff6e1.tar.gz | |
Mon Jul 24 21:22:03 2000 Andrew G. Gilpin <agg1@cs.wustl.edu>
Diffstat (limited to 'ace/Object_Manager.h')
| -rw-r--r-- | ace/Object_Manager.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index 91457dd2e46..101fbaf0927 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -432,5 +432,32 @@ public: #include "ace/Managed_Object.h" +#if !defined (ACE_LACKS_ACE_SVCCONF) +// 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. +class ACE_Service_Object; +extern "C" ACE_Export +ACE_Service_Object * +_make_ACE_Service_Manager (ACE_Service_Object_Exterminator *); +#endif /* ! ACE_LACKS_ACE_SVCCONF */ + +// hack to get around errors while compiling using split-cpp +#if defined (ACE_HAS_THREADS) + +# if defined (ACE_IS_SPLITTING) +typedef ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> ACE_Static_Object_Lock_Type; + +# if defined (__GNUC__) +// With g++, suppress the warning that this is unused. +static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock __attribute__ ((unused)) = 0; +# else +static ACE_Static_Object_Lock_Type *ACE_Static_Object_Lock_lock = 0; +# endif /* __GNUC__ */ + +# endif /* ACE_IS_SPLITTING */ + +#endif /* ACE_HAS_THREADS */ + #include "ace/post.h" #endif /* ACE_OBJECT_MANAGER_H */ |