summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2018-02-26 18:20:26 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2018-02-26 18:20:26 +0100
commit73307efb832657d40b3c39492a2c4ae4b0b47762 (patch)
treeaba492b7a42d6664a8cbaf734de5ea8bd11e817e
parent7675cb72f6b415ae19a278ac6364089eb57b4fff (diff)
downloadATCD-73307efb832657d40b3c39492a2c4ae4b0b47762.tar.gz
Doxygen fixes and fixed some typos
* TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h: * TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h: * TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h: * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h: * TAO/tests/Bug_2953_Regression/client.cpp: * TAO/tests/Bug_2953_Regression/server.cpp: * TAO/tests/Smart_Proxies/Benchmark/client.cpp: * TAO/tests/Smart_Proxies/Policy/client.cpp: * TAO/tests/Smart_Proxies/client.cpp:
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h16
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h2
-rw-r--r--TAO/tests/Bug_2953_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2953_Regression/server.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/Policy/client.cpp2
-rw-r--r--TAO/tests/Smart_Proxies/client.cpp2
9 files changed, 17 insertions, 17 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 0a3ad7bbe82..217847c8491 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -86,7 +86,7 @@ public:
/**
* If not zero the event channel will deactive its Impl and call
- * orb->shutdown(0), when destoy is invoked.
+ * orb->shutdown(0), when destroy is invoked.
*/
int destroy_on_shutdown;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index fca03ee81ca..1f3ec0ccab5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -61,7 +61,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 <id> and <kind>.
+ * binding with @a id and @a kind.
*/
virtual int bind (const char *id,
const char *kind,
@@ -69,7 +69,7 @@ public:
CosNaming::BindingType type) = 0;
/**
- * Overwrite a binding containing <id> and <kind> (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. Returns
* -1 on failure.
*/
@@ -78,16 +78,16 @@ public:
CORBA::Object_ptr obj,
CosNaming::BindingType type) = 0;
- /// Remove a binding containing <id> and <kind> from the table.
+ /// Remove a binding containing @a id and @a kind from the table.
/// Return 0 on success and -1 on failure.
virtual int unbind (const char * id,
const char * kind) = 0;
/**
- * Find the binding containing <id> and <kind> in the table, and
+ * Find the binding containing @a id and @a kind in the table, and
* pass binding's type and object back to the caller by reference.
* Return 0 on success and -1 on failure. Note: a 'duplicated' object
- * reference is assigned to <obj>, so the caller is responsible for
+ * reference is assigned to @a obj, so the caller is responsible for
* its deallocation.
*/
virtual int find (const char * id,
@@ -141,7 +141,7 @@ public:
// = CosNaming::NamingContext idl interface methods.
/**
- * Create a binding for name <n> and object <obj> in the naming
+ * Create a binding for name @a n and object @a obj in the naming
* context. Compound names are treated as follows: ctx->bind (<c1;
* c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
* obj) if the there already exists a binding for the specified
@@ -153,7 +153,7 @@ public:
CORBA::Object_ptr obj);
/**
- * This is similar to <bind> operation above, except for when the
+ * This is similar to bind() operation above, except for when the
* binding for the specified name already exists in the specified
* context. In that case, the existing binding is replaced with the
* new one.
@@ -205,7 +205,7 @@ public:
* Delete the naming context. The user should take care to <unbind> any
* bindings in which the given context is bound to some names, to
* avoid dangling references when invoking <destroy> operation.
- * NOTE: <destory> is a no-op on the root context.
+ * NOTE: <destroy> is a no-op on the root context.
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index a87cf97f8d4..a50a36eba42 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -129,7 +129,7 @@ public:
* Delete the naming context. The user should take care to <unbind> any
* bindings in which the given context is bound to some names, to
* avoid dangling references when invoking <destroy> operation.
- * NOTE: <destory> is a no-op on the root context.
+ * NOTE: <destroy> is a no-op on the root context.
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
@@ -325,7 +325,7 @@ public:
* Delete the naming context. The user should take care to <unbind> any
* bindings in which the given context is bound to some names, to
* avoid dangling references when invoking <destroy> operation.
- * NOTE: <destory> is a no-op on the root context.
+ * NOTE: <destroy> is a no-op on the root context.
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index b40a8da924a..67116707bc7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -351,7 +351,7 @@ public:
* Delete the naming context. The user should take care to <unbind> any
* bindings in which the given context is bound to some names, to
* avoid dangling references when invoking <destroy> operation.
- * NOTE: <destory> is a no-op on the root context.
+ * NOTE: <destroy> is a no-op on the root context.
* NOTE: after <destroy> is invoked on a Naming Context, all
* BindingIterators associated with that Naming Context are also destroyed.
*/
diff --git a/TAO/tests/Bug_2953_Regression/client.cpp b/TAO/tests/Bug_2953_Regression/client.cpp
index 97767d80a2a..e85c91e7923 100644
--- a/TAO/tests/Bug_2953_Regression/client.cpp
+++ b/TAO/tests/Bug_2953_Regression/client.cpp
@@ -18,7 +18,7 @@ void shutdownORB(CORBA::ORB_ptr orb, const char * orbid)
orb->destroy();
ACE_DEBUG ((LM_DEBUG,
- "ORB <%C> is destoyed\n",
+ "ORB <%C> is destroyed\n",
orbid));
}
diff --git a/TAO/tests/Bug_2953_Regression/server.cpp b/TAO/tests/Bug_2953_Regression/server.cpp
index 0c7ac2eb322..5c55c057945 100644
--- a/TAO/tests/Bug_2953_Regression/server.cpp
+++ b/TAO/tests/Bug_2953_Regression/server.cpp
@@ -209,7 +209,7 @@ void shutdownORB(CORBA::ORB_ptr orb, const char * orbid)
orb->destroy();
ACE_DEBUG ((LM_DEBUG,
- "ORB <%C> is destoyed\n",
+ "ORB <%C> is destroyed\n",
orbid));
}
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 09546145c47..57c559330aa 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -125,7 +125,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// user-defined smart factory on the heap as the smart proxy
// generated classes take care of destroying the object. This
// way it a win situation for the application developer who
- // doesnt have to make sure to destoy it and also for the smart
+ // doesnt have to make sure to destroy it and also for the smart
// proxy designer who now can manage the lifetime of the object
// much surely.
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index e6017a2b44a..b28fe0a4b24 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// user-defined smart factory on the heap as the smart proxy
// generated classes take care of destroying the object. This
// way it a win situation for the application developer who
- // doesnt have to make sure to destoy it and also for the smart
+ // doesnt have to make sure to destroy it and also for the smart
// proxy designer who now can manage the lifetime of the object
// much surely.
// By default this factory is permanent (i.e. registered for
diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 47d5bab2cb2..f6bdb290393 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// user-defined smart factory on the heap as the smart proxy
// generated classes take care of destroying the object. This
// way it a win situation for the application developer who
- // doesnt have to make sure to destoy it and also for the smart
+ // doesnt have to make sure to destroy it and also for the smart
// proxy designer who now can manage the lifetime of the object
// much surely.
Smart_Test_Factory *test_factory = 0;