diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
| commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
| tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/Service_Gestalt.cpp | |
| parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
| parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
| download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/Service_Gestalt.cpp')
| -rw-r--r-- | ACE/ace/Service_Gestalt.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index fe41085324d..bc82751959c 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -819,14 +819,8 @@ ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) ACE_TEXT("ACE_Service_Config::get_xml_svc_conf")), 0); - void * foo = - xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); - -#if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) - int const temp_p = reinterpret_cast<int> (foo); -#else + void * foo = xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); 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); |