diff options
Diffstat (limited to 'ace/Registry_Name_Space.cpp')
| -rw-r--r-- | ace/Registry_Name_Space.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ace/Registry_Name_Space.cpp b/ace/Registry_Name_Space.cpp index bfdc9d45bd7..a16c972691b 100644 --- a/ace/Registry_Name_Space.cpp +++ b/ace/Registry_Name_Space.cpp @@ -14,8 +14,8 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void) ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options) { if (this->open (name_options) != 0) - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Registry_Name_Space::open"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Registry_Name_Space::open"))); } @@ -27,20 +27,20 @@ ACE_Registry_Name_Space::~ACE_Registry_Name_Space (void) int ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) { - const ASYS_TCHAR *host = name_options->nameserver_host (); + const ACE_TCHAR *host = name_options->nameserver_host (); ACE_Registry::Naming_Context predefined; int result = ACE_Predefined_Naming_Contexts::connect (predefined, HKEY_LOCAL_MACHINE, - ASYS_ONLY_WIDE_STRING (host)); + host); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Predefined_Naming_Context::connect")), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Predefined_Naming_Context::connect")), result); else { // Directory - ACE_Registry::Istring name = name_options->namespace_dir (); + ACE_TString name = name_options->namespace_dir (); // Separator name += ACE_Registry::STRING_SEPARATOR; // Filename @@ -50,7 +50,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) result = predefined.bind_context (name, this->context_); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); } return 0; } @@ -208,7 +208,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, if (binding.type () == ACE_Registry::OBJECT) { // Key - ACE_Registry::Istring string = binding.name (); + ACE_TString string = binding.name (); ACE_WString key (string.c_str ()); // Value @@ -218,7 +218,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, value, type); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_Registry::Naming_Context::resolve")), result); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::resolve")), result); // Complete binding ACE_Name_Binding binding (key, value, type); |