From 2a79a1aeb48d175b76a3907bae9e92678b367a9d Mon Sep 17 00:00:00 2001 From: kgv Date: Mon, 5 Dec 2016 12:57:27 +0300 Subject: [PATCH] 0028186: Foundation Classes, NCollection_List - methods "Remove" and "Contains" prevent template usage ::Remove() and ::Contains() are now defined as template methods to allow using NCollection_List with types without quality operator. --- src/NCollection/NCollection_List.hxx | 6 ++++-- src/NCollection/NCollection_StlIterator.hxx | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/NCollection/NCollection_List.hxx b/src/NCollection/NCollection_List.hxx index 8719407879..33bd5aa2a2 100644 --- a/src/NCollection/NCollection_List.hxx +++ b/src/NCollection/NCollection_List.hxx @@ -200,7 +200,8 @@ public: } //! Remove the first occurrence of the object. - Standard_Boolean Remove (const TheItemType& theObject) + template // instantiate this method on first call only for types defining equality operator + Standard_Boolean Remove (const TheValueType& theObject) { for (Iterator anIter (*this); anIter.More(); anIter.Next()) { @@ -285,7 +286,8 @@ public: { PReverse(); } //! Return true if object is stored in the list. - Standard_Boolean Contains (const TheItemType& theObject) const + template // instantiate this method on first call only for types defining equality operator + Standard_Boolean Contains (const TheValueType& theObject) const { for (Iterator anIter (*this); anIter.More(); anIter.Next()) { diff --git a/src/NCollection/NCollection_StlIterator.hxx b/src/NCollection/NCollection_StlIterator.hxx index d666270ecd..8e6c6ea842 100644 --- a/src/NCollection/NCollection_StlIterator.hxx +++ b/src/NCollection/NCollection_StlIterator.hxx @@ -101,6 +101,12 @@ public: return myIterator; } + //! Access to NCollection iterator instance + BaseIterator& ChangeIterator() + { + return myIterator; + } + protected: //! @name methods related to forward STL iterator // Note: Here we use SFINAE (Substitution failure is not an error) to choose