diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C index 04c12e91b7ed3153455d464c7d8bad3e52bf6fe6..7a49f2fdc80907e122c6e753fba7e4d99cebe973 100644 --- a/applications/test/List/Test-List.C +++ b/applications/test/List/Test-List.C @@ -132,35 +132,6 @@ int main(int argc, char *argv[]) << "-wordList: " << wLst << nl << "-stringList: " << sLst << endl; - - Info<< nl - << "Test List Iterator Constuctor" << endl; - - List<vector> initialList(IStringStream("((0 1 2) (3 4 5) (6 7 8))")()); - - Info<< " Initial List: " << initialList << endl; - - List<vector> iteratorList(initialList.begin(), initialList.end()); - - Info<< " Foam::List constructed from Foam::List: " - << iteratorList << endl; - - std::list<vector> stlList(initialList.begin(), initialList.end()); - - Info<< " std::list constructed from Foam::List: "; - - std::list<vector>::iterator it; - for (it=stlList.begin(); it != stlList.end(); ++it) - { - Info<< *it << " "; - } - Info<< endl; - - List<vector> iteratorSTLList(stlList.begin(), stlList.end()); - - Info<< " Foam::List constructed from std::list: " - << iteratorList << endl; - return 0; } diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C index 34cc05ee8d601445f743bb7e80a816daf5d19e6b..62f988b9db091899e78ad08fe6665066311570d0 100644 --- a/src/OpenFOAM/containers/Lists/List/List.C +++ b/src/OpenFOAM/containers/Lists/List/List.C @@ -25,7 +25,6 @@ License #include "List.H" #include "ListLoopM.H" - #include "FixedList.H" #include "PtrList.H" #include "SLList.H" @@ -189,37 +188,6 @@ Foam::List<T>::List(const UList<T>& a, const labelUList& map) } -template<class T> -template<class InputIterator> -Foam::List<T>::List(InputIterator first, InputIterator last) -{ - label s = 0; - for - ( - InputIterator iter = first; - iter != last; - ++iter - ) - { - s++; - } - - setSize(s); - - s = 0; - - for - ( - InputIterator iter = first; - iter != last; - ++iter - ) - { - this->operator[](s++) = *iter; - } -} - - template<class T> template<unsigned Size> Foam::List<T>::List(const FixedList<T, Size>& lst) @@ -534,6 +502,7 @@ void Foam::List<T>::operator=(const BiIndirectList<T>& lst) } } + // * * * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * // #include "ListIO.C" diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H index a4f342cc4aad51793337b2d30564cc37f0c22de6..77c9a5e40ac3d6982b246f9b4b2de47109a561e6 100644 --- a/src/OpenFOAM/containers/Lists/List/List.H +++ b/src/OpenFOAM/containers/Lists/List/List.H @@ -61,8 +61,10 @@ template<class T> Istream& operator>>(Istream&, List<T>&); template<class T, unsigned Size> class FixedList; template<class T> class PtrList; template<class T> class SLList; + template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv> - class DynamicList; +class DynamicList; + template<class T> class SortableList; template<class T> class IndirectList; template<class T> class UIndirectList; @@ -120,10 +122,6 @@ public: //- Construct as subset. List(const UList<T>&, const labelUList& mapAddressing); - //- Construct given start and end iterators. - template<class InputIterator> - List(InputIterator first, InputIterator last); - //- Construct as copy of FixedList<T, Size> template<unsigned Size> explicit List(const FixedList<T, Size>&); @@ -262,7 +260,7 @@ List<T> readList(Istream&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #include "ListI.H" +#include "ListI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //