diff options
Diffstat (limited to 'ace/Configuration.cpp')
| -rw-r--r-- | ace/Configuration.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp index 24a27647cc1..468f1b9e9dc 100644 --- a/ace/Configuration.cpp +++ b/ace/Configuration.cpp @@ -12,18 +12,16 @@ # include "ace/OS_NS_unistd.h" #endif /* ACE_LACKS_ACCESS */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -# if defined (ACE_HAS_THREADS) + +#if defined (ACE_HAS_THREADS) // ACE_SYNCH_MUTEX should not be used in the template instantiations // because the resulting template instantiation for the // single-threaded case already exists in ACE. template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> >; template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex>; template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>; -# endif /* ACE_HAS_THREADS */ - +#endif /* ACE_HAS_THREADS */ template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>; template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>; template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>; @@ -52,15 +50,14 @@ template class ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# if defined (ACE_HAS_THREADS) +#if defined (ACE_HAS_THREADS) // ACE_SYNCH_MUTEX should not be used in the template instantiations // because the resulting template instantiation for the // single-threaded case already exists in ACE. #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> > #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> #pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block> -# endif /* ACE_HAS_THREADS */ - +#endif /* ACE_HAS_THREADS */ #pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId> #pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId> #pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int> @@ -1784,7 +1781,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key VALUE_HASH::ITERATOR value_iter = value_hash_map->begin (); while (!value_iter.done ()) { - VALUE_HASH::ENTRY* value_entry = 0; + VALUE_HASH::ENTRY* value_entry; if (!value_iter.next (value_entry)) return 1; @@ -1844,7 +1841,7 @@ ACE_Configuration_Heap::enumerate_values (const ACE_Configuration_Section_Key& k } // Get the next entry - ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>* entry = 0; + ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Value_IntId>* entry; if (!pKey->value_iter_->next (entry)) return 1; @@ -1887,7 +1884,7 @@ ACE_Configuration_Heap::enumerate_sections (const ACE_Configuration_Section_Key& } // Get the next entry - ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>* entry = 0; + ACE_Hash_Map_Entry<ACE_Configuration_ExtId, int>* entry; if (!pKey->section_iter_->next (entry)) return 1; @@ -2260,5 +2257,3 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key, return 0; } - -ACE_END_VERSIONED_NAMESPACE_DECL |