From 2f9869e83d157e0167fbe5bae92acc5ba750f3fa Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Sat, 3 Aug 2002 00:05:37 +0000 Subject: ChangeLogTag:Fri Aug 2 16:51:23 2002 Ossama Othman --- TAO/ChangeLog | 9 ++++++++ .../orbsvcs/PortableGroup/Portable_Group_Map.cpp | 25 +++++++++------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f65be912beb..2c47a54854d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Fri Aug 2 16:51:23 2002 Ossama Othman + + * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp: + + Removed all explicit template instantiations for old style + ACE_Hash_Map_Manager. They aren't needed. This may also + address the strange unresolved symbol link-time errors since the + old style hash map templates inherit from the "_Ex" versions. + Fri Aug 2 15:13:28 2002 Douglas C. Schmidt * docs/configurations.html: Added a documentation entry for the diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index 24539bf6251..eaa66f2a201 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -142,8 +142,9 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_ u_long TAO_GroupId_Hash::operator () (const PortableGroup::TagGroupTaggedComponent *id) const { - u_long hash = ACE::hash_pjw ((const char *) id->group_domain_id, - ACE_OS::strlen ((const char *) id->group_domain_id)); + u_long hash = + ACE::hash_pjw ((const char *) id->group_domain_id, + ACE_OS::strlen ((const char *) id->group_domain_id)); // Truncate the object_group_id in half for the has. hash += (u_long) id->object_group_id; @@ -154,36 +155,30 @@ TAO_GroupId_Hash::operator () (const PortableGroup::TagGroupTaggedComponent *id) } int -TAO_GroupId_Equal_To::operator () (const PortableGroup::TagGroupTaggedComponent *lhs, - const PortableGroup::TagGroupTaggedComponent *rhs) const +TAO_GroupId_Equal_To::operator () ( + const PortableGroup::TagGroupTaggedComponent *lhs, + const PortableGroup::TagGroupTaggedComponent *rhs) const { - return (ACE_OS::strcmp (lhs->group_domain_id, rhs->group_domain_id) == 0) && - (lhs->object_group_id == rhs->object_group_id) && - (lhs->object_group_ref_version == rhs->object_group_ref_version); + return + (ACE_OS::strcmp (lhs->group_domain_id, rhs->group_domain_id) == 0) && + (lhs->object_group_id == rhs->object_group_id) && + (lhs->object_group_ref_version == rhs->object_group_ref_version); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Hash_Map_Entry; -//template class ACE_Hash_Map_Manager; -template class ACE_Hash_Map_Iterator; -template class ACE_Hash_Map_Reverse_Iterator; template class ACE_Hash_Map_Manager_Ex; template class ACE_Hash_Map_Iterator_Base_Ex; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; template class ACE_Hash_Map_Iterator_Ex; template class ACE_Hash_Map_Reverse_Iterator_Ex; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Manager -#pragma instantiate ACE_Hash_Map_Iterator -#pragma instantiate ACE_Hash_Map_Reverse_Iterator #pragma instantiate ACE_Hash_Map_Manager_Ex #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> #pragma instantiate ACE_Hash_Map_Iterator_Ex #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex -- cgit v1.2.1