summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfields_t <fields_t@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-29 19:05:13 +0000
committerfields_t <fields_t@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-29 19:05:13 +0000
commit65146b7806c7b54b00fc4016c1774cafee0923f3 (patch)
tree3193b8239087980997d9cb3b6a78ffc7d5eb23e6
parente5f6b0e944089e26c5f7c2f68a7b4af7561ec9ae (diff)
downloadATCD-65146b7806c7b54b00fc4016c1774cafee0923f3.tar.gz
ChangeLogTag:Wed Sep 29 12:09:40 MST 2004 Trevor Fields <fields_t@ociweb.com>
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_Options.h12
2 files changed, 11 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c193af1e8cb..f04bb24ec37 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 29 12:09:40 MST 2004 Trevor Fields <fields_t@ociweb.com>
+
+ * orbsvcs/ImplRepo_Service/Locator_Options.h:
+ Changed to handle wide characters.
+
Wed Sep 29 13:12:27 2004 Iliyan Jeliazkov <jeliazkov_i@ociweb.com>
* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 7c812bd0e15..64b9f644240 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -62,7 +62,7 @@ public:
unsigned int debug (void) const;
/// Returns the file where the IOR should be stored.
- const ACE_CString& ior_filename (void) const;
+ const ACE_TString& ior_filename (void) const;
/// Will we listen for multicast location requests?
bool multicast (void) const;
@@ -72,11 +72,11 @@ public:
int save_registry_options();
- const ACE_CString& cmdline(void) const;
+ const ACE_TString& cmdline(void) const;
/// File that contains the activator related information
/// that the persistent locator has to save.
- const ACE_CString& persist_file_name(void) const;
+ const ACE_TString& persist_file_name(void) const;
/// Do we allow modifications to the servers?
bool readonly (void) const;
@@ -99,7 +99,7 @@ private:
void print_usage (void) const;
/// Run a service command.
- int run_service_command (const ACE_CString& cmdline);
+ int run_service_command (const ACE_TString& cmdline);
int load_registry_options();
private:
@@ -111,7 +111,7 @@ private:
unsigned int debug_;
/// File where the IOR of the server object is stored.
- ACE_CString ior_output_file_;
+ ACE_TString ior_output_file_;
/// Will we listen for multicast location requests?
bool multicast_;
@@ -135,7 +135,7 @@ private:
ACE_CString cmdline_;
/// The persistent XML file name.
- ACE_CString persist_file_name_;
+ ACE_TString persist_file_name_;
};
#endif