From 5b628ebb312475abb68b93dcfa995733580e01d5 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Tue, 1 Dec 2009 18:53:15 +0100 Subject: [PATCH] HashSet - use AnyType, AnyHash templates as per HashTable - this probably should have been in commit c7c9a6e0 (2009-11-04) but got overseen in the HashTbl -> HashTable switch --- src/OpenFOAM/containers/HashTables/HashSet/HashSet.C | 10 +++++++--- src/OpenFOAM/containers/HashTables/HashSet/HashSet.H | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C index 644e98ccfb2..041f0ccf77a 100644 --- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C +++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C @@ -44,14 +44,18 @@ Foam::HashSet<Key, Hash>::HashSet(const UList<Key>& lst) template<class Key, class Hash> -template<class AnyType> -Foam::HashSet<Key, Hash>::HashSet(const HashTable<AnyType, Key, Hash>& h) +template<class AnyType, class AnyHash> +Foam::HashSet<Key, Hash>::HashSet +( + const HashTable<AnyType, Key, AnyHash>& h +) : HashTable<nil, Key, Hash>(h.size()) { for ( - typename HashTable<AnyType, Key, Hash>::const_iterator cit = h.cbegin(); + typename HashTable<AnyType, Key, AnyHash>::const_iterator + cit = h.cbegin(); cit != h.cend(); ++cit ) diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H index 7fa22c6b967..4b9aa1a268d 100644 --- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H +++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H @@ -106,8 +106,8 @@ public: //- Construct from the keys of another HashTable, // the type of values held is arbitrary. - template<class AnyType> - HashSet(const HashTable<AnyType, Key, Hash>&); + template<class AnyType, class AnyHash> + HashSet(const HashTable<AnyType, Key, AnyHash>&); // Member Functions -- GitLab