diff options
| author | tgirard <tgirard@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-02 19:33:30 +0000 |
|---|---|---|
| committer | tgirard <tgirard@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-02 19:33:30 +0000 |
| commit | 8898a213ef785910c11c112efb21143a400c94b0 (patch) | |
| tree | 5cc09da9c8e0a2e3a88df928b3117c7f73af4545 /ACE/ace/Service_Config.h | |
| parent | d29553dabeec80ce661859c1913d7df6fc55f3cc (diff) | |
| download | ATCD-8898a213ef785910c11c112efb21143a400c94b0.tar.gz | |
Wed Jan 2 19:19:58 UTC 2013 Thomas Girard <thomas.g.girard@free.fr>
* ace/Service_Config.h: ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE
fix when ACE_VERSIONED_SO=2. Because of '.' in the version,
addition of prefix ACE_DLL_PREDIX and suffix ACE_DLL_SUFFIX
is skipped, preventing ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE
from working when ACE+TAO is built with versioned_so=2.
Diffstat (limited to 'ACE/ace/Service_Config.h')
| -rw-r--r-- | ACE/ace/Service_Config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index f372190cc2b..3865e75b152 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -62,9 +62,11 @@ class ACE_DLL; ACE_TEXT ("dynamic ") \ ACE_TEXT (ident) \ ACE_TEXT (" Service_Object * ") \ + ACE_DLL_PREFIX \ ACE_TEXT (libpathname) \ ACE_TEXT ("-") \ ACE_TEXT (version) \ + ACE_DLL_SUFFIX \ ACE_TEXT (":") \ ACE_TEXT (objectclass) \ ACE_TEXT ("() \"") \ @@ -111,9 +113,11 @@ class ACE_Svc_Conf_Param; ACE_TEXT (ident) \ ACE_TEXT ("\" type=\"Service_Object\">") \ ACE_TEXT ("<initializer path=\"") \ + ACE_DLL_PREFIX \ ACE_TEXT (libpathname) \ ACE_TEXT ("-") \ ACE_TEXT (version) \ + ACE_DLL_SUFFIX \ ACE_TEXT ("\" init=\"") \ ACE_TEXT (objectclass) \ ACE_TEXT ("\"") \ |