diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-07 21:44:59 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-07 21:44:59 +0000 |
| commit | 8d71c4a0d0aba3fb7bfb59461b7accd36d8810cd (patch) | |
| tree | b5805bca09b3335bcaa6c4e1597f4dde6d3cbe53 | |
| parent | de4968f8948d30a15bf5b886207ac160ee40536f (diff) | |
| download | ATCD-8d71c4a0d0aba3fb7bfb59461b7accd36d8810cd.tar.gz | |
ChangeLogTag:Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | ace/Registry_Name_Space.cpp | 25 |
4 files changed, 45 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4589698e9a3..c6fac8f0c82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Registry_Name_Space.cpp: Changed to conditionally use + char_rep for binding/unbinding/resolving name bindings. This is + because ACE_CString and ACE_WString no longer allow + initialization with different string type. + Fri Dec 7 10:22:25 2001 Ossama Othman <ossama@uci.edu> * ace/SSL/SSL_SOCK_Stream.i (close): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 4589698e9a3..c6fac8f0c82 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Registry_Name_Space.cpp: Changed to conditionally use + char_rep for binding/unbinding/resolving name bindings. This is + because ACE_CString and ACE_WString no longer allow + initialization with different string type. + Fri Dec 7 10:22:25 2001 Ossama Othman <ossama@uci.edu> * ace/SSL/SSL_SOCK_Stream.i (close): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 4589698e9a3..c6fac8f0c82 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Dec 07 15:42:44 2001 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Registry_Name_Space.cpp: Changed to conditionally use + char_rep for binding/unbinding/resolving name bindings. This is + because ACE_CString and ACE_WString no longer allow + initialization with different string type. + Fri Dec 7 10:22:25 2001 Ossama Othman <ossama@uci.edu> * ace/SSL/SSL_SOCK_Stream.i (close): diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp index 4293246892e..276f875657b 100644 --- a/ace/Registry_Name_Space.cpp +++ b/ace/Registry_Name_Space.cpp @@ -72,8 +72,13 @@ ACE_Registry_Name_Space::bind (const ACE_NS_WString &name, size, REG_SZ); // Add new <key>/<value> pair +#if defined ACE_USES_WCHAR return this->context_.bind (name.fast_rep(), object); +#else + return this->context_.bind (name.char_rep(), + object); +#endif /* ACE_HAS_WCHAR */ } @@ -93,15 +98,24 @@ ACE_Registry_Name_Space::rebind (const ACE_NS_WString &name, size, REG_SZ); // Add new <key>/<value> pair +#if defined (ACE_USES_WCHAR) return this->context_.rebind (name.fast_rep (), object); +#else + return this->context_.rebind (name.char_rep (), + object); +#endif /* ACE_USES_WCHAR */ } int ACE_Registry_Name_Space::unbind (const ACE_NS_WString &name) { +#if defined (ACE_USES_WCHAR) return this->context_.unbind (name.fast_rep ()); +#else + return this->context_.unbind (name.char_rep ()); +#endif /* ACE_USES_WCHAR */ } @@ -113,7 +127,12 @@ ACE_Registry_Name_Space::resolve (const ACE_NS_WString &name, // This object will be used to query the size of the data. // Note: The query_object.data will be null for this invocation. ACE_Registry::Object query_object; - int result = this->context_.resolve (name.fast_rep (), query_object); + int result = +#if defined (ACE_USES_WCHAR) + this->context_.resolve (name.fast_rep (), query_object); +#else + this->context_.resolve (name.char_rep (), query_object); +#endif /* ACE_USES_WCHAR */ if (result != 0) return result; @@ -126,7 +145,11 @@ ACE_Registry_Name_Space::resolve (const ACE_NS_WString &name, query_object.size (), REG_SZ); +#if defined (ACE_USES_WCHAR) result = this->context_.resolve (name.fast_rep (), object); +#else + result = this->context_.resolve (name.char_rep (), object); +#endif /* ACE_USES_WCHAR */ if (object.size () != query_object.size ()) return -1; if (result != 0) |