diff options
| -rw-r--r-- | ChangeLog-99b | 4 | ||||
| -rw-r--r-- | ace/Naming_Context.cpp | 2 | ||||
| -rw-r--r-- | ace/Naming_Context.h | 3 | ||||
| -rw-r--r-- | examples/Log_Msg/test_log_msg.cpp | 2 | ||||
| -rw-r--r-- | examples/Naming/test_multiple_contexts.cpp | 3 | ||||
| -rw-r--r-- | examples/Naming/test_non_existent.cpp | 2 | ||||
| -rw-r--r-- | examples/Naming/test_open.cpp | 3 | ||||
| -rw-r--r-- | examples/Naming/test_writers.cpp | 3 |
8 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 330b191c59c..a046f41d484 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,5 +1,9 @@ Mon Jun 7 00:11:00 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + * ace/Naming_Context.h (ACE_Name_Options): Changed the parameters + from "char *argv[]" to "const char *argv[]" since this is + cleaner. + * tests/Hash_Map_Manager_Test.cpp: Changed the use of ASYS_TCHAR * to LPCTSTR to ensure const-correctness. diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index b165a601ac9..a563091d829 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -564,7 +564,7 @@ ACE_Name_Options::verbose (void) } void -ACE_Name_Options::parse_args (int argc, char *argv[]) +ACE_Name_Options::parse_args (int argc, const char *argv[]) { ACE_TRACE ("ACE_Name_Options::parse_args"); ACE_LOG_MSG->open (argv[0]); diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h index a8b51c9c3a5..a2595fbea2a 100644 --- a/ace/Naming_Context.h +++ b/ace/Naming_Context.h @@ -254,7 +254,8 @@ public: ACE_Name_Options (void); ~ACE_Name_Options (void); - void parse_args (int argc, char *argv[]); + void parse_args (int argc, + const char *argv[]); // Parse arguments // = Set/Get port number diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp index 09f0e913a63..f6186fad67d 100644 --- a/examples/Log_Msg/test_log_msg.cpp +++ b/examples/Log_Msg/test_log_msg.cpp @@ -169,7 +169,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "This LM_DEBUG message should not print!\n")); - const char badname[] = "badname"; + char badname[] = "badname"; char *l_argv[2]; l_argv[0] = badname; diff --git a/examples/Naming/test_multiple_contexts.cpp b/examples/Naming/test_multiple_contexts.cpp index 828cea2c030..081ea12e03f 100644 --- a/examples/Naming/test_multiple_contexts.cpp +++ b/examples/Naming/test_multiple_contexts.cpp @@ -55,7 +55,8 @@ int main (int, char *[]) int n_argc = sizeof (n_argv) / sizeof (char *) -1; - name_options->parse_args (m_argc, m_argv); + name_options->parse_args (m_argc, + m_argv); i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL); ACE_DEBUG ((LM_DEBUG, diff --git a/examples/Naming/test_non_existent.cpp b/examples/Naming/test_non_existent.cpp index f8785ad0f81..c2ffb5cd0b6 100644 --- a/examples/Naming/test_non_existent.cpp +++ b/examples/Naming/test_non_existent.cpp @@ -31,7 +31,7 @@ int main (int, char *[]) sizeof (m_argv) / sizeof (char *) -1; name_options->parse_args (m_argc, - (char **) m_argv); + m_argv); i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL); ACE_DEBUG ((LM_DEBUG, diff --git a/examples/Naming/test_open.cpp b/examples/Naming/test_open.cpp index adcc1fb0962..6e9a01c42a1 100644 --- a/examples/Naming/test_open.cpp +++ b/examples/Naming/test_open.cpp @@ -24,7 +24,8 @@ main (int argc, char **argv) int m_argc = sizeof (m_argv) / sizeof (char *) -1; - name_options->parse_args (m_argc, m_argv); + name_options->parse_args (m_argc, + m_argv); int result = ns.open (ACE_Naming_Context::NET_LOCAL); ACE_DEBUG ((LM_DEBUG, diff --git a/examples/Naming/test_writers.cpp b/examples/Naming/test_writers.cpp index 1a23d2e91f8..7da15473547 100644 --- a/examples/Naming/test_writers.cpp +++ b/examples/Naming/test_writers.cpp @@ -24,7 +24,8 @@ int main (int, char *[]) int m_argc = sizeof (m_argv) / sizeof (char *) -1; - name_options->parse_args (m_argc,m_argv); + name_options->parse_args (m_argc, + m_argv); i = ns_ptr->open (ACE_Naming_Context::NODE_LOCAL); ACE_DEBUG ((LM_DEBUG, "(%P) opened with %d\n", |