diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-17 12:29:14 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-04-17 12:29:14 +0000 |
| commit | b65e2985b1f47c7bb0f791e27f72d4b3b276b266 (patch) | |
| tree | eb09fbb6caefe86440a0e18509ca1359ece14fef | |
| parent | 4c2d2e4ceb2cc06681b7d074779cec41098cc502 (diff) | |
| download | ATCD-b65e2985b1f47c7bb0f791e27f72d4b3b276b266.tar.gz | |
ChangeLogTag:Thu Apr 17 12:07:44 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/Configuration.cpp | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 882af7f7c40..4489fb1f5dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 17 12:07:44 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/Configuration.cpp (temp_name): + + Access a static member variable with the class name outside + the class, not the this pointer. Changed return value to const. + Thu Apr 17 07:05:50 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/ProjectCreator.pm: diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 8a74f4aaa21..4cf75a0833e 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -484,9 +484,9 @@ int ACE_Configuration::operator== (const ACE_Configuration& rhs) const static const int ACE_DEFAULT_BUFSIZE = 256; -static ACE_TCHAR *temp_name (ACE_TCHAR *name) +static const ACE_TCHAR *temp_name (const ACE_TCHAR *name) { - if (name && *name == this->NULL_String_) + if (name && *name == ACE_Configuration::NULL_String_) return 0; return name; } @@ -731,7 +731,7 @@ ACE_Configuration_Win32Registry::set_string_value (const ACE_Configuration_Secti const ACE_TCHAR* name, const ACE_TString& value) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -758,7 +758,7 @@ ACE_Configuration_Win32Registry::set_integer_value (const ACE_Configuration_Sect const ACE_TCHAR* name, u_int value) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -783,7 +783,7 @@ ACE_Configuration_Win32Registry::set_binary_value (const ACE_Configuration_Secti const void* data, size_t length) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -808,7 +808,7 @@ ACE_Configuration_Win32Registry::get_string_value (const ACE_Configuration_Secti const ACE_TCHAR* name, ACE_TString& value) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -859,7 +859,7 @@ ACE_Configuration_Win32Registry::get_integer_value (const ACE_Configuration_Sect const ACE_TCHAR* name, u_int& value) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -892,7 +892,7 @@ ACE_Configuration_Win32Registry::get_binary_value (const ACE_Configuration_Secti void *&data, size_t &length) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -941,7 +941,7 @@ ACE_Configuration_Win32Registry::find_value (const ACE_Configuration_Section_Key const ACE_TCHAR* name, VALUETYPE& type_out) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; @@ -982,7 +982,7 @@ int ACE_Configuration_Win32Registry::remove_value (const ACE_Configuration_Section_Key& key, const ACE_TCHAR* name) { - ACE_TCHAR *t_name = temp_name (name); + const ACE_TCHAR *t_name = temp_name (name); if (validate_value_name (t_name)) return -1; |