summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2002-11-25 18:56:01 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2002-11-25 18:56:01 +0000
commit6c570075c6ec3e0ba04ae2f92f5693e0778a5552 (patch)
tree2900b8fdb65e05bebb56ce94f931216adef07f51 /ace
parent79d3bd1886f816f4ca4b36eef456b368a5bf5198 (diff)
downloadATCD-6c570075c6ec3e0ba04ae2f92f5693e0778a5552.tar.gz
ChangeLogTag: Mon Nov 25 18:50:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace')
-rw-r--r--ace/ATM_Params.h2
-rw-r--r--ace/Local_Name_Space_T.cpp12
-rw-r--r--ace/Local_Name_Space_T.h12
-rw-r--r--ace/Process.h4
-rw-r--r--ace/Svc_Handler.cpp2
5 files changed, 16 insertions, 16 deletions
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index dd2cbbe3c29..bdf4cadfac4 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -53,7 +53,7 @@ typedef int Param_Udata;
* @class ACE_ATM_Params
*
* @brief Wrapper class that simplifies the information passed to the ATM
- * enabled <ACE_ATM_Connector> class.
+ * enabled ACE_ATM_Connector class.
*/
class ACE_Export ACE_ATM_Params
{
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 8681c76f14f..56dbf42f516 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -519,7 +519,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
}
template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names_i (ACE_PWSTRING_SET &set,
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names_i (ACE_WSTRING_SET &set,
const ACE_NS_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_names_i");
@@ -552,7 +552,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names_i (ACE_PWSTRING_SET &
}
template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values_i (ACE_PWSTRING_SET &set,
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values_i (ACE_WSTRING_SET &set,
const ACE_NS_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_values_i");
@@ -585,7 +585,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values_i (ACE_PWSTRING_SET
}
template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_types_i (ACE_PWSTRING_SET &set,
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_types_i (ACE_WSTRING_SET &set,
const ACE_NS_WString &pattern)
{
ACE_TRACE ("ACE_Local_Name_Space::list_types_i");
@@ -795,7 +795,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
}
template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names (ACE_PWSTRING_SET &set,
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names (ACE_WSTRING_SET &set,
const ACE_NS_WString &pattern)
{
// Note that we *must* use structured exception handling here
@@ -813,7 +813,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names (ACE_PWSTRING_SET &se
}
template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values (ACE_PWSTRING_SET &set,
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values (ACE_WSTRING_SET &set,
const ACE_NS_WString &pattern)
{
// Note that we *must* use structured exception handling here
@@ -831,7 +831,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values (ACE_PWSTRING_SET &s
}
template <ACE_MEM_POOL_1, class ACE_LOCK> int
-ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_types (ACE_PWSTRING_SET &set,
+ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_types (ACE_WSTRING_SET &set,
const ACE_NS_WString &pattern)
{
// Note that we *must* use structured exception handling here
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index 344e8a95511..1933908f2e6 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -26,8 +26,8 @@
#include "ace/SString.h"
#include "ace/Local_Name_Space.h"
-// A short-hand name for our set of name/value/type tuples passed back
-// to callers.
+/// A short-hand name for our set of name/value/type tuples passed back
+/// to callers.
typedef ACE_Unbounded_Set<ACE_NS_WString> ACE_WSTRING_SET;
// Simplify later usage by defining typedefs.
@@ -64,7 +64,7 @@ public:
ACE_Name_Space_Map (ALLOCATOR *alloc);
// = The following methods are Proxies to the underlying methods
- // provided by <ACE_Hash_Map_Manager>. When they are called, they
+ // provided by ACE_Hash_Map_Manager. When they are called, they
// acquire the lock, set the allocator to the one specific to this
// process, and then call down to perform the intended operation.
int bind (const ACE_NS_String &,
@@ -124,7 +124,7 @@ public:
*/
int open (ACE_Naming_Context::Context_Scope_Type scope_in);
- /// destructor, do some cleanup :TBD: last dtor should "compress"
+ /// Destructor, do some cleanup :TBD: last dtor should "compress"
/// file
~ACE_Local_Name_Space (void);
@@ -148,7 +148,7 @@ public:
virtual int unbind_i (const ACE_NS_WString &name);
/// Get value and type of a given name binding (Wide chars). The
- /// caller is responsible for deleting <type>!
+ /// caller is responsible for deleting @a type!
virtual int resolve (const ACE_NS_WString &name,
ACE_NS_WString &value,
char *&type);
@@ -221,7 +221,7 @@ private:
int remap (EXCEPTION_POINTERS *ep);
#endif /* ACE_WIN32 */
- /// Factor out code from <bind> and <rebind>.
+ /// Factor out code from bind() and rebind().
int shared_bind (const ACE_NS_WString &name,
const ACE_NS_WString &value,
const char *type, int rebind);
diff --git a/ace/Process.h b/ace/Process.h
index a28fca18b65..aaa9df10825 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -298,7 +298,7 @@ public:
/**
* Set the inherit_environment flag.
*/
- void inherit_environment (int);
+ void inherit_environment (int nv);
#endif /* ACE_WIN32 */
protected:
@@ -519,7 +519,7 @@ public:
/// <waitpid>). This value is system dependent.
ACE_exitcode exit_code (void) const;
- /// Return the Process' return value. This method returns the
+ /// Return the Process' return value. This method returns the
/// actual return value that a child process returns or <exit>s.
int return_value (void) const;
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index 07003ca4066..d16028e7078 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -303,7 +303,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time_Value &,
}
template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close (unsigned long)
+ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close (u_long)
{
ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close");
return this->handle_close ();