diff options
Diffstat (limited to 'ACE/ace/Configuration.cpp')
| -rw-r--r-- | ACE/ace/Configuration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 039c2a1c192..49c2696217f 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -428,7 +428,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const ////////////////////////////////////////////////////////////////////////////// -#if defined (WIN32) +#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) static const int ACE_DEFAULT_BUFSIZE = 256; @@ -1062,7 +1062,7 @@ ACE_Configuration_Win32Registry::resolve_key (HKEY hKey, return result; } -#endif /* WIN_32 */ +#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ /////////////////////////////////////////////////////////////// @@ -1167,7 +1167,7 @@ ACE_Configuration_ExtId::operator!= (const ACE_Configuration_ExtId& rhs) const u_long ACE_Configuration_ExtId::hash (void) const { - ACE_TString temp (name_, 0, 0); + ACE_TString temp (name_, 0, false); return temp.hash (); } @@ -1366,7 +1366,7 @@ ACE_Configuration_Heap::load_key (const ACE_Configuration_Section_Key& key, return -1; } - ACE_TString temp (pKey->path_, 0, 0); + ACE_TString temp (pKey->path_, 0, false); name.assign_nocopy (temp); return 0; } @@ -1552,7 +1552,7 @@ ACE_Configuration_Heap::open_simple_section (const ACE_Configuration_Section_Key int create, ACE_Configuration_Section_Key& result) { - ACE_TString section (0, 0, 0); + ACE_TString section (0, 0, false); if (load_key (base, section)) { @@ -1994,7 +1994,7 @@ ACE_Configuration_Heap::get_integer_value (const ACE_Configuration_Section_Key& return -1; // Get the section name from the key - ACE_TString section (0, 0, 0); + ACE_TString section (0, 0, false); if (this->load_key (key, section) != 0) { |