diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-29 10:11:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-29 10:11:11 +0000 |
| commit | d8160699a23449f238772da88444646db5800ea4 (patch) | |
| tree | b7042132ce9c2824804c8d2d8a6275fdeb7612bf | |
| parent | 10415ad38987373a6ba6d31f40af83b9d9d3aa1e (diff) | |
| download | ATCD-d8160699a23449f238772da88444646db5800ea4.tar.gz | |
Thu Nov 29 10:10:56 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Service_Config.h:
Fixed compile errors in xml builds
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.h | 29 |
2 files changed, 34 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 077faa5b3eb..2e0c732b097 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 29 10:10:56 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Service_Config.h: + Fixed compile errors in xml builds + Thu Nov 29 08:49:39 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/CDR_Stream.cpp: diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 4f31be9f7dd..f372190cc2b 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -105,6 +105,35 @@ class ACE_Svc_Conf_Param; ACE_TEXT (" params=\"") \ ACE_TEXT (parameters) \ ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>") +#if defined (ACE_VERSIONED_SO) && (ACE_VERSIONED_SO == 2) +#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \ + ACE_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \ + ACE_TEXT (ident) \ + ACE_TEXT ("\" type=\"Service_Object\">") \ + ACE_TEXT ("<initializer path=\"") \ + ACE_TEXT (libpathname) \ + ACE_TEXT ("-") \ + ACE_TEXT (version) \ + ACE_TEXT ("\" init=\"") \ + ACE_TEXT (objectclass) \ + ACE_TEXT ("\"") \ + ACE_TEXT (" params=\"") \ + ACE_TEXT (parameters) \ + ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>") +#else +#define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \ + ACE_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \ + ACE_TEXT (ident) \ + ACE_TEXT ("\" type=\"Service_Object\">") \ + ACE_TEXT ("<initializer path=\"") \ + ACE_TEXT (libpathname) \ + ACE_TEXT ("\" init=\"") \ + ACE_TEXT (objectclass) \ + ACE_TEXT ("\"") \ + ACE_TEXT (" params=\"") \ + ACE_TEXT (parameters) \ + ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>") +#endif #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \ ACE_TEXT ("<ACE_Svc_Conf><remove id=\"") \ ACE_TEXT (ident) \ |