diff options
Diffstat (limited to 'ACE/ace/Registry.cpp')
| -rw-r--r-- | ACE/ace/Registry.cpp | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index 2e6803ea8cd..b6907ebec18 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -6,7 +6,7 @@ ACE_RCSID (ace, Registry, "$Id$") -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) # include "ace/os_include/os_netdb.h" # include "ace/OS_NS_unistd.h" @@ -814,10 +814,10 @@ ACE_Registry::Naming_Context::list (Binding_List &list) // Default constructor ACE_Registry::Binding_Iterator::Binding_Iterator () - : object_iteration_ (*this), - context_iteration_ (*this), - iteration_complete_ (*this) { + this->object_iteration_.iterator (this); + this->context_iteration_.iterator (this); + this->iteration_complete_.iterator (this); this->reset (); } @@ -839,27 +839,15 @@ ACE_Registry::Binding_Iterator::Iteration_State::reset () } -ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (Binding_Iterator &iter) - : parent_ (&iter), - index_ (0) -{ -} - - -ACE_Registry::Binding_Iterator::Object_Iteration::Object_Iteration (Binding_Iterator &iter) - : Iteration_State (iter) -{ -} - - -ACE_Registry::Binding_Iterator::Context_Iteration::Context_Iteration (Binding_Iterator &iter) - : Iteration_State (iter) +void +ACE_Registry::Binding_Iterator::Iteration_State::iterator (Binding_Iterator *iter) { + this->parent_ = iter; } -ACE_Registry::Binding_Iterator::Iteration_Complete::Iteration_Complete (Binding_Iterator &iter) - : Iteration_State (iter) +ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State () + : index_ (0) { } @@ -1136,4 +1124,4 @@ ACE_Predefined_Naming_Contexts::is_local_host (const ACE_TCHAR *machine_name) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_WIN32 */ +#endif /* ACE_WIN32 && !ACE_LACKS_WIN32_REGISTRY */ |