diff options
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp index e7790934528..fb5a1afc6be 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp @@ -945,7 +945,6 @@ ImR_Activator_i::init (ACE_ENV_SINGLE_ARG_DECL) // register this activator (with the name of the hostname where // this instance is being run) with the locator. -#if defined (ACE_WIN32) struct hostent *hinfo = ACE_OS::gethostbyname (hostname); char full_hostname[BUFSIZ]; ACE_OS::strcpy (full_hostname, hinfo->h_name); @@ -954,14 +953,8 @@ ImR_Activator_i::init (ACE_ENV_SINGLE_ARG_DECL) locator->register_activator (full_hostname, imr_obj.in () ACE_ENV_ARG_PARAMETER); -#else - CORBA::ULong reg_act = - locator->register_activator (hostname, - imr_obj.in () - ACE_ENV_ARG_PARAMETER); -#endif /* ACE_WIN32 */ ACE_TRY_CHECK; - + if (reg_act == 1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 8dadb284ef3..e5c237f1074 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -705,13 +705,10 @@ TAO_IMR_Op_Add::run (void) // else use the hostname on which tao_imr is run char hostname[BUFSIZ]; ACE_OS::hostname (hostname, BUFSIZ); -#if defined (ACE_WIN32) + struct hostent *hinfo = ACE_OS::gethostbyname (hostname); startup_options.location = CORBA::string_dup (hinfo->h_name); -#else - startup_options.location = CORBA::string_dup (hostname); -#endif /* ACE_WIN32 */ } ACE_DECLARE_NEW_CORBA_ENV; |