diff options
author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-09-03 08:36:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-03 08:36:55 +0200 |
commit | 0ce207c1a728b55cdb5a7cee832d89e6e47ff7b0 (patch) | |
tree | d7a8805a0e60b125dbe1187a7effaab36bdbbcd3 | |
parent | c96749ebafa25b5660884e9071bf178837b53298 (diff) | |
parent | 09cb0cc2e512ebcd3eba1a784dcf460568339d3f (diff) | |
download | ATCD-0ce207c1a728b55cdb5a7cee832d89e6e47ff7b0.tar.gz |
Merge pull request #287 from jwillemsen/master
4 files changed, 9 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h index dce55502484..d46187a2908 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h @@ -108,12 +108,12 @@ public: /** * Create an entry for a Persistent Naming Context in <index_>, - * i.e., a context with <poa_id>, <counter> and <hash_map> has just + * i.e., a context with @a poa_id, @A counter and @A hash_map has just * been created, and is registering with us. */ int bind (const char *poa_id, ACE_UINT32 *&counter, CONTEXT *hash_map); - /// Remove an entry for the Persistent Naming Context with <poa_id> + /// Remove an entry for the Persistent Naming Context with @a poa_id /// from <index_> (i.e., this context has just been destroyed). int unbind (const char *poa_id); @@ -163,7 +163,7 @@ private: /// Base address for the memory-mapped file. void *base_address_; - /// ORB. We use it for several object_to_string conversions, and + /// ORB. We use it for several object_to_string conversions, and /// keep it around for Persistent Naming Contexts' use. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h index a0ed5c22948..47a45979bbc 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h @@ -70,7 +70,7 @@ public: * @class TAO_Persistent_ExtId * * @brief Helper class for TAO_Persistent_Bindings_Map: unifies several - * data items, so they can be stored together as a <key> + * data items, so they can be stored together as a <key> * for a <value> in a hash table holding the state of a Persistent * Naming Context. * @@ -109,17 +109,17 @@ public: /// Inequality comparison operator. bool operator!= (const TAO_Persistent_ExtId &rhs) const; - /// <hash> function is required in order for this class to be usable by + /// hash() function is required in order for this class to be usable by /// ACE_Hash_Map_Manager. u_long hash (void) const; // = Data members. - /// <id> portion of the name to be associated with some object + /// id portion of the name to be associated with some object /// reference in a Persistent Naming Context. const char * id_; - /// <kind> portion of the name to be associated with some object + /// kind portion of the name to be associated with some object /// reference in a Persistent Naming Context. const char * kind_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 0e0ca240abc..d911c4b2b2d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -25,7 +25,7 @@ void TAO_Notify_CosEC_ProxyPushSupplier::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer) { // Convert Consumer to Base Type - TAO_Notify_PushConsumer* consumer; + TAO_Notify_PushConsumer* consumer = 0; ACE_NEW_THROW_EX (consumer, TAO_Notify_PushConsumer (this), CORBA::NO_MEMORY ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h index b19b9439e09..8b7738439c5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h @@ -33,7 +33,7 @@ class TAO_Notify_Builder; /** * @class TAO_Notify_Properties * - * @brief Global properties that strategize Notify's run-time behaviour. + * @brief Global properties that strategize Notify's run-time behavior. */ class TAO_Notify_Serv_Export TAO_Notify_Properties { |