From 068b86554f9954b3270d6e263adbc817c6b733fa Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 31 Aug 2016 11:48:02 +0200 Subject: Documentation changes --- TAO/examples/Callback_Quoter/Consumer_Input_Handler.h | 2 +- TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp | 1 - TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp | 2 +- TAO/orbsvcs/Naming_Service/README | 2 -- TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h | 14 +++++++------- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h index b33918cc7e5..883673c2251 100644 --- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h +++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.h @@ -63,7 +63,7 @@ public: // // = DESCRIPTION // Used so that the process of registering, unregistering - // and exitting neednt be dependent on 'r' 'u' and 'q'. + // and exiting neednt be dependent on 'r' 'u' and 'q'. // Also, #define clutters up the global namespace. REGISTER = 'r', diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp index 6b557d5780e..fe908ddb630 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp @@ -11,7 +11,6 @@ */ //============================================================================= - #include "orbsvcs/Log_Macros.h" #if !defined (ACE_WIN32) || defined (ACE_LACKS_WIN32_SERVICES) diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index c2adf6a50d9..1887780411e 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -264,7 +264,7 @@ TAO_NT_Naming_Service::svc (void) } catch (const CORBA::Exception& ex) { - ORBSVCS_DEBUG ((LM_INFO, "Exception in service - exitting\n")); + ORBSVCS_DEBUG ((LM_INFO, "Exception in service - exiting\n")); ex._tao_print_exception ("TAO NT Naming Service"); return -1; } diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README index 401ca1d417e..cd79e15c245 100644 --- a/TAO/orbsvcs/Naming_Service/README +++ b/TAO/orbsvcs/Naming_Service/README @@ -1,5 +1,3 @@ - - This directory contains files that implement a server for the TAO Naming Service. In addition, it contains files that run the TAO Naming Service as a Windows NT Service. Both of these services are diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h index df45c4f337b..d0c3f2ffbc3 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h @@ -43,8 +43,8 @@ public: /// Constructor. TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb); - /// Allocate hash map of size from persistent storage - /// using the . + /// Allocate hash map of size @a hash_map_size from persistent storage + /// using the @a alloc. int open (size_t hash_map_size, ACE_Allocator *alloc); @@ -81,7 +81,7 @@ public: /** * Add a binding with the specified parameters to the table. * Return 0 on success and -1 on failure, 1 if there already is a - * binding with and . + * binding with @a id and @a kind. */ virtual int bind (const char *id, const char *kind, @@ -89,7 +89,7 @@ public: CosNaming::BindingType type); /** - * Overwrite a binding containing and (or create a new + * Overwrite a binding containing @a id and @a kind (or create a new * one if one doesn't exist) with the specified parameters. Return * 0 or 1 on success. Return -1 or -2 on failure. (-2 is returned * if the new and old bindings differ in type). @@ -210,10 +210,10 @@ public: virtual CosNaming::NamingContext_ptr new_context (void); /** - * Returns at most the requested number of bindings in - * . If the naming context contains additional bindings, they + * Returns at most the requested number of bindings @a how_many in + * @a bl. If the naming context contains additional bindings, they * are returned with a BindingIterator. In the naming context does - * not contain any additional bindings returned as null. + * not contain any additional bindings @a bi returned as null. */ virtual void list (CORBA::ULong how_many, CosNaming::BindingList_out &bl, -- cgit v1.2.1