diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C index 2c8167adcee45afb665e519a15231d7113468879..9bf799d6b341de7d3c2943a48e82bf4556c40d3f 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C @@ -74,7 +74,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(const label size) { table_ = new hashedEntry*[tableSize_]; - for (label hashIdx = 0; hashIdx < tableSize_; hashIdx++) + for (label hashIdx = 0; hashIdx < tableSize_; ++hashIdx) { table_[hashIdx] = nullptr; } @@ -203,6 +203,17 @@ Foam::HashTable<T, Key, Hash>::find ( const Key& key ) const +{ + return this->cfind(key); +} + + +template<class T, class Key, class Hash> +typename Foam::HashTable<T, Key, Hash>::const_iterator +Foam::HashTable<T, Key, Hash>::cfind +( + const Key& key +) const { if (nElmts_) { @@ -912,7 +923,7 @@ bool Foam::HashTable<T, Key, Hash>::operator== for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter) { - const_iterator other = find(iter.key()); + const_iterator other = this->cfind(iter.key()); if (!other.found() || other.object() != iter.object()) { diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H index 3b3338084d9b1a3d46fcd8fe308d6d93f2a2cb71..3f9a2df85fc41a92137ce58a0e05ab96bb2d2056 100644 --- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H +++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H @@ -327,6 +327,10 @@ public: // If not found iterator = end() const_iterator find(const Key& key) const; + //- Find and return an const_iterator set at the hashed entry + // If not found iterator = end() + const_iterator cfind(const Key& key) const; + //- Return hashed entry if it exists, or return the given default inline const T& lookup(const Key& key, const T& deflt) const; diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C index ec30dfc20a0e71eb4a4a631871adb6c2e0b18b02..c024ff335e210a5cdc0ec34925e598fe5a4c2fd3 100644 --- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C +++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C @@ -158,6 +158,17 @@ Foam::StaticHashTable<T, Key, Hash>::find ( const Key& key ) const +{ + return this->cfind(key); +} + + +template<class T, class Key, class Hash> +typename Foam::StaticHashTable<T, Key, Hash>::const_iterator +Foam::StaticHashTable<T, Key, Hash>::cfind +( + const Key& key +) const { if (nElmts_) { diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H index 5b0a3ef8a59fb88c9c94cd22278c46eda6765420..850eb1fc43d3bf5055c70c8c56a9f200de9a5b9b 100644 --- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H +++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H @@ -203,6 +203,10 @@ public: // If not found iterator = end() const_iterator find(const Key& key) const; + //- Find and return an const_iterator set at the hashed entry + // If not found iterator = end() + const_iterator cfind(const Key& key) const; + //- Return the table of contents List<Key> toc() const; diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H index b2705f2805065dd981aa32ff5dbe44f3e8c05d70..b9054aee85f1a8a0580d343bc8b9944727b4360f 100644 --- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H +++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H @@ -87,10 +87,10 @@ public: //- Read a word from Istream and return the corresponding // enumeration element - Enum read(Istream&) const; + Enum read(Istream& is) const; //- Write the name representation of the enumeration to an Ostream - void write(const Enum e, Ostream&) const; + void write(const Enum e, Ostream& os) const; //- The set of names as a list of strings static stringList strings();