diff options
| author | msmit <msmit@remedy.nl> | 2009-03-16 19:38:57 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-03-16 19:38:57 +0000 |
| commit | 0a5ed56a742d4d6800a631cc04c33c1c9e15fe9c (patch) | |
| tree | 85acae929a51467b042fa85f705a5d930f01d55b | |
| parent | eb363f5812cce3ac1a3ad58c4af2d54788e4876f (diff) | |
| download | ATCD-0a5ed56a742d4d6800a631cc04c33c1c9e15fe9c.tar.gz | |
Mon Mar 16 19:35:53 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ace/Service_Gestalt.cpp:
Applied patch attached to Bugzilla 3618.
Fixed Bugzilla 3618.
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Service_Gestalt.cpp | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 370f28f90c7..186bcfe340d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 16 19:35:53 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * ace/Service_Gestalt.cpp: + Applied patch attached to Bugzilla 3618. + Fixed Bugzilla 3618. + Mon Mar 16 18:42:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * docs/analyticsTracking.php: diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index 95b3989009b..8b395d88b89 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -853,8 +853,14 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) void * foo = xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); - ACE_XML_Svc_Conf::Factory factory = - reinterpret_cast<ACE_XML_Svc_Conf::Factory> (foo); +#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) + int const temp_p = reinterpret_cast<int> (foo); +#else + intptr_t const temp_p = reinterpret_cast<intptr_t> (foo); +#endif + + ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (temp_p); + if (factory == 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"), |