diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-28 14:30:28 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-28 14:30:28 +0000 |
commit | 8c6537495b8430d71bff891fd834c8522bb22cb1 (patch) | |
tree | fdf3cb3a1e556ef5c863a9e7aa42891278897a2c /TAO/tao | |
parent | dc49d86a9abec3c0766a21b3298af63c5dd7765a (diff) | |
download | ATCD-8c6537495b8430d71bff891fd834c8522bb22cb1.tar.gz |
Mon Nov 28 14:29:45 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ImR_Client/ImR_Client.cpp:
* tao/ImR_Client/ImplRepo.pidl:
* tao/PortableServer/Operation_Table_Dynamic_Hash.cpp:
* tao/PortableServer/Operation_Table_Perfect_Hash.cpp:
Const and layout changes
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/ImR_Client/ImR_Client.cpp | 14 | ||||
-rw-r--r-- | TAO/tao/ImR_Client/ImplRepo.pidl | 28 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp | 10 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp | 3 |
4 files changed, 25 insertions, 30 deletions
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index f0cd9e424de..010b938b876 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -121,13 +121,13 @@ namespace TAO ACE_CString serverId = poa->orb_core ().server_id (); ACE_CString name; if (serverId.empty ()) - { - name = poa->name(); - } + { + name = poa->name(); + } else - { - name = serverId + ":" + poa->name(); - } + { + name = serverId + ":" + poa->name(); + } imr_locator->server_is_running (name.c_str (), partial_ior.c_str(), @@ -216,7 +216,7 @@ namespace TAO root_poa->deactivate_object_i (id.in()); - server_object_ = 0; + this->server_object_ = 0; } } diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl index 383d7dcef23..d713d44bbca 100644 --- a/TAO/tao/ImR_Client/ImplRepo.pidl +++ b/TAO/tao/ImR_Client/ImplRepo.pidl @@ -103,7 +103,7 @@ module ImplementationRepository */ interface Administration { - /// Activate server that is named <server>. + /// Activate server that is named @a server. /// /// The <NotFound> exception is raised when <server> is not found /// in the Implementation Repository. The <CannotActivate> exception @@ -112,37 +112,37 @@ module ImplementationRepository void activate_server (in string server) raises (NotFound, CannotActivate); - /// Add/Update the the <server> + /// Add/Update the the @a server. /// The <NotFound> exception is raised when the activator specified /// in the options is not registered. void add_or_update_server (in string server, in StartupOptions options) raises(NotFound); - /// Remove <server> from the Implementation Repository. + /// Remove @a server from the Implementation Repository. /// - /// The <NotFound> exception is raised when <server> is not found + /// The <NotFound> exception is raised when @a server is not found /// in the Implementation Repository. void remove_server (in string server) raises (NotFound); /// Tries to shutdown the server, first gracefully, then ungracefully. /// - /// The <NotFound> exception is raised when <server> is not found + /// The <NotFound> exception is raised when @a server is not found /// in the Implementation Repository. void shutdown_server (in string server) raises (NotFound); - /// Used to notify the Implementation Repository that <server> is alive - /// and well at <partial_ior>. + /// Used to notify the Implementation Repository that @a server is alive + /// and well at @a partial_ior. /// - /// The <NotFound> exception is raised when <server> is not found + /// The <NotFound> exception is raised when @a server is not found /// in the Implementation Repository. void server_is_running (in string server, in string partial_ior, in ServerObject server_object) raises (NotFound); - /// Used to tell the Implementation Repository that <server> is shutting + /// Used to tell the Implementation Repository that @a server is shutting /// down. /// /// The <NotFound> exception is raised when <server> is not found @@ -151,14 +151,14 @@ module ImplementationRepository void server_is_shutting_down (in string server) raises (NotFound); - /// Returns the startup information for a given <server>. + /// Returns the startup information for a given @a server. void find (in string server, out ServerInformation info); - /// Returns at most <how_many> servers in <server_list>. If there + /// Returns at most @a how_many servers in @a server_list. If there /// are additional servers, they can be received through the - /// <server_iterator>. If there are no more servers, then - /// <server_iterator> is null. - /// If how_many == 0, then returns all servers. + /// @a server_iterator. If there are no more servers, then + /// @a server_iterator is null. + /// If @a how_many == 0, then returns all servers. void list (in unsigned long how_many, out ServerInformationList server_list, out ServerInformationIterator server_iterator); diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index eae26a71e4e..918c6f5e765 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -74,8 +74,7 @@ int TAO_Dynamic_Hash_OpTable::bind (const char *opname, const TAO::Operation_Skeletons skel_ptr) { - return this->hash_.bind (CORBA::string_dup (opname), - skel_ptr); + return this->hash_.bind (CORBA::string_dup (opname), skel_ptr); } int @@ -86,9 +85,7 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname, ACE_FUNCTION_TIMEPROBE (TAO_DYNAMIC_HASH_OPTABLE_FIND_START); TAO::Operation_Skeletons s; - int retval = - this->hash_.find ((const char *)opname, - s); + int const retval = this->hash_.find (opname, s); if (retval != -1) { @@ -108,8 +105,7 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname, TAO::Operation_Skeletons skel; - int retval = - this->hash_.find ((const char *)opname, skel); + int const retval = this->hash_.find (opname, skel); if (retval != -1) { diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index da100f9802e..53444157d75 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -65,8 +65,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, { ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START); - TAO_operation_db_entry const * const entry = lookup (opname, - length); + TAO_operation_db_entry const * const entry = lookup (opname, length); if (entry == 0) { skelfunc = 0; // insure that somebody can't call a wrong function! |