diff options
Diffstat (limited to 'TAO/tao/Strategies/SHMIOP_Acceptor.cpp')
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Acceptor.cpp | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index fa502e57458..162f0f88e88 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -59,13 +59,9 @@ TAO_SHMIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key, // Check if multiple endpoints should be put in one profile or // if they should be spread across multiple profiles. if (priority == TAO_INVALID_PRIORITY) - return this->create_new_profile (object_key, - mprofile, - priority); + return this->create_new_profile (object_key, mprofile, priority); else - return this->create_shared_profile (object_key, - mprofile, - priority); + return this->create_shared_profile (object_key, mprofile, priority); } int @@ -135,9 +131,7 @@ TAO_SHMIOP_Acceptor::create_shared_profile (const TAO::ObjectKey &object_key, { // If <mprofile> doesn't contain SHMIOP_Profile, we need to create // one. - return create_new_profile (object_key, - mprofile, - priority); + return create_new_profile (object_key, mprofile, priority); } else { @@ -208,8 +202,7 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core, if (port) this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port)); - return this->open_i (orb_core, - reactor); + return this->open_i (orb_core, reactor); } int @@ -232,13 +225,11 @@ TAO_SHMIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, // address. this->host_ = this->address_.get_host_name (); - return this->open_i (orb_core, - reactor); + return this->open_i (orb_core, reactor); } int -TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, - ACE_OFF_T size) +TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, ACE_OFF_T size) { this->mmap_file_prefix_ = prefix; this->mmap_size_ = size; @@ -247,8 +238,7 @@ TAO_SHMIOP_Acceptor::set_mmap_options (const ACE_TCHAR *prefix, } int -TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, - ACE_Reactor *reactor) +TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, ACE_Reactor *reactor) { this->orb_core_ = orb_core; @@ -322,8 +312,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, // This will be the actualy host name of the original endpoint. ACE_TCHAR tmp_host[MAXHOSTNAMELEN+1]; - if (this->address_.get_host_name (tmp_host, - sizeof tmp_host) != 0) + if (this->address_.get_host_name (tmp_host, sizeof tmp_host) != 0) { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, @@ -368,8 +357,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile, // Read the version. We just read it here. We don't*do any* // processing. - if (!(cdr.read_octet (major) - && cdr.read_octet (minor))) + if (!(cdr.read_octet (major) && cdr.read_octet (minor))) { if (TAO_debug_level > 0) { |