diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-17 08:37:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-17 08:37:56 +0000 |
| commit | 49bf5ca6a771e1af5dbfb1feecdcc369a83cab23 (patch) | |
| tree | 0f2e3cc767837958a691c037ccb15201eff192ba | |
| parent | a9b7ed9b0ce03618cf68874adbd56ade7e2f3da9 (diff) | |
| download | ATCD-49bf5ca6a771e1af5dbfb1feecdcc369a83cab23.tar.gz | |
ChangeLogTag: Fri Jun 17 08:36:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/Object_Manager.cpp | 4 | ||||
| -rw-r--r-- | ace/Service_Config.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index fe1ad9d359e..024d9b4acb0 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -584,10 +584,6 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock) } #endif /* ACE_MT_SAFE */ -// NOTE: this function needs to appear _after_ the -// get_singleton_lock () functions in order to compile with -// g++ 2.7.2.3. -// // Clean up an ACE_Object_Manager. There can be instances of this object // other than The Instance. This can happen if (on Win32) the ACE DLL // causes one to be created, or if a user creates one for some reason. diff --git a/ace/Service_Config.h b/ace/Service_Config.h index c08e0227ebe..a9dc0855c6c 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -39,8 +39,14 @@ class ACE_Thread_Manager; class ACE_DLL; #if (ACE_USES_CLASSIC_SVC_CONF == 1) +#define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ + "dynamic " ident " Service_Object * " libpathname ":" objectclass "() \"" parameters "\"" class ACE_Svc_Conf_Param; #else +#define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ + "<ACE_Svc_Conf><dynamic id=\"" ident "\" type=\"Service_Object\">" \ + "<initializer path=\"" libpathname "\" init=\"" objectclass "\"" \ + " params=\"" parameters "\"/></dynamic></ACE_Svc_Conf>" class ACE_XML_Svc_Conf; #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ |