summaryrefslogtreecommitdiff
path: root/ace/Name_Request_Reply.h
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Name_Request_Reply.h')
-rw-r--r--ace/Name_Request_Reply.h22
1 files changed, 9 insertions, 13 deletions
diff --git a/ace/Name_Request_Reply.h b/ace/Name_Request_Reply.h
index 07e4b61d95b..f5704b7472b 100644
--- a/ace/Name_Request_Reply.h
+++ b/ace/Name_Request_Reply.h
@@ -27,8 +27,6 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
class ACE_Time_Value;
/**
@@ -73,9 +71,9 @@ public:
/// Create a ACE_Name_Request message.
ACE_Name_Request (ACE_INT32 msg_type, // Type of request.
- const ACE_WCHAR_T name[], //
+ const wchar_t name[], //
const ACE_UINT32 name_length,
- const ACE_WCHAR_T value[],
+ const wchar_t value[],
const ACE_UINT32 value_length,
const char type[],
const ACE_UINT32 type_length,
@@ -102,12 +100,12 @@ public:
void timeout (const ACE_Time_Value timeout);
// = Set/get the name
- const ACE_WCHAR_T *name (void) const;
- void name (const ACE_WCHAR_T *);
+ const wchar_t *name (void) const;
+ void name (const wchar_t *);
// = Set/get the value
- const ACE_WCHAR_T *value (void) const;
- void value (const ACE_WCHAR_T *);
+ const wchar_t *value (void) const;
+ void value (const wchar_t *);
// = Set/get the type
const char *type (void) const;
@@ -169,17 +167,17 @@ private:
/// The data portion contains the <name_>
/// followed by the <value_>
/// followed by the <type_>.
- ACE_WCHAR_T data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2];
+ wchar_t data_[MAX_NAME_LENGTH + MAXPATHLEN + MAXPATHLEN + 2];
};
/// Transfer buffer.
Transfer transfer_;
/// Pointer to the beginning of the name in this->data_.
- ACE_WCHAR_T *name_;
+ wchar_t *name_;
/// Pointer to the beginning of the value in this->data_;
- ACE_WCHAR_T *value_;
+ wchar_t *value_;
/// Pointer to the beginning of the type in this->data_;
char *type_;
@@ -258,8 +256,6 @@ private:
Transfer transfer_;
};
-ACE_END_VERSIONED_NAMESPACE_DECL
-
#include /**/ "ace/post.h"
#endif /* ACE_NAME_REQUEST_REPLY_H */