diff options
| -rw-r--r-- | ChangeLog-97a | 6 | ||||
| -rw-r--r-- | ace/Registry.cpp | 5 | ||||
| -rw-r--r-- | ace/Registry.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index 650074a2f85..8a0b6fbb9ff 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,3 +1,9 @@ +Thu Apr 3 22:17:53 1997 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> + + * ace/Registry.cpp: Changed STRING_SEPARATOR from Istring to + LPCTSTR. Thanks to Matthias Kerkhoff <make@cs.tu-berlin.de> for + suggesting this. + Thu Apr 3 21:39:45 1997 Chris Cleeland <cleeland@cs.wustl.edu> * ace/OS.i (mutex_init): Removed errant open-brace ('{'). Thanks diff --git a/ace/Registry.cpp b/ace/Registry.cpp index a9faa0a1867..4559f76fe30 100644 --- a/ace/Registry.cpp +++ b/ace/Registry.cpp @@ -22,8 +22,7 @@ // Separator for components in a name /* static */ -const ACE_Registry::Istring ACE_Registry::STRING_SEPARATOR = __TEXT ("\\"); - +LPCTSTR ACE_Registry::STRING_SEPARATOR = __TEXT ("\\"); // Simple binding constructor ACE_Registry::Binding::Binding () @@ -618,7 +617,7 @@ ACE_Registry::make_name (const Istring &string) component.id_ = string.substr (last_position, new_position - last_position); // Skip past the seperator - new_position += ACE_Registry::STRING_SEPARATOR.length (); + new_position += ACE_OS::strlen (ACE_Registry::STRING_SEPARATOR); } else { diff --git a/ace/Registry.h b/ace/Registry.h index c03b6db0ff1..50ebe03d91d 100644 --- a/ace/Registry.h +++ b/ace/Registry.h @@ -55,7 +55,7 @@ public: typedef std::vector<Name_Component> Name; // A Name is an ordered collections of components (ids) - static const Istring STRING_SEPARATOR; + static LPCTSTR STRING_SEPARATOR; // Separator for components in a name static Istring make_string (const Name &name); |