diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
-rw-r--r-- | ace/Configuration.cpp | 5 | ||||
-rw-r--r-- | tests/Config_Test.cpp | 2 |
5 files changed, 30 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3b426e495e7..384c0124bea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Jun 12 11:25:22 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * tests/Config_Test.cpp (test): Removed what appeared to be + an unnecessary and unused called to + const ACE_Configuration_Section_Key &root = config->root_section (); + + * ace/Configuration.cpp (open_section): Fixed a warning in the + loop expression. + Wed Jun 12 11:49:33 2002 Steve Huston <shuston@riverace.com> * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 3b426e495e7..384c0124bea 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Wed Jun 12 11:25:22 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * tests/Config_Test.cpp (test): Removed what appeared to be + an unnecessary and unused called to + const ACE_Configuration_Section_Key &root = config->root_section (); + + * ace/Configuration.cpp (open_section): Fixed a warning in the + loop expression. + Wed Jun 12 11:49:33 2002 Steve Huston <shuston@riverace.com> * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 3b426e495e7..384c0124bea 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Wed Jun 12 11:25:22 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * tests/Config_Test.cpp (test): Removed what appeared to be + an unnecessary and unused called to + const ACE_Configuration_Section_Key &root = config->root_section (); + + * ace/Configuration.cpp (open_section): Fixed a warning in the + loop expression. + Wed Jun 12 11:49:33 2002 Steve Huston <shuston@riverace.com> * examples/C++NPv2/AC_Client_Logging_Daemon.cpp: Changed to diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index faf9c1d2fed..641665a7668 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -1517,10 +1517,11 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, if (validate_name (sub_section, true)) return -1; - const ACE_TCHAR* separator; result = base; - while (separator = ACE_OS_String::strchr (sub_section, ACE_TEXT ('\\'))) + for (const ACE_TCHAR* separator; + (separator = ACE_OS_String::strchr (sub_section, ACE_TEXT ('\\'))) != 0; + ) { ACE_TString simple_section (sub_section, separator - sub_section); int ret_val = diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 9e0c6dd2436..c4537c53a54 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -30,8 +30,6 @@ test (ACE_Configuration *config, ACE_Configuration_Section_Key &testsection) { ACE_TString stvalue; - const ACE_Configuration_Section_Key &root = - config->root_section (); // Set some values. if (config->set_string_value (testsection, |