zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

List: Removed unused constructor from iterators

Browse Source 
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=2074
This commit is contained in:
Henry Weller
2016-04-29 17:17:45 +01:00
parent 81041e5d3c
commit c43b78e8de
3 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
applications/test/List/Test-List.C
View File

@ -132,35 +132,6 @@ int main(int argc, char *argv[])
<< "-wordList: " << wLst << nl << "-wordList: " << wLst << nl
<< "-stringList: " << sLst << endl; << "-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; return 0;
} }

33
src/OpenFOAM/containers/Lists/List/List.C
View File

@ -25,7 +25,6 @@ License
#include "List.H" #include "List.H"
#include "ListLoopM.H" #include "ListLoopM.H"
#include "FixedList.H" #include "FixedList.H"
#include "PtrList.H" #include "PtrList.H"
#include "SLList.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<class T>
template<unsigned Size> template<unsigned Size>
Foam::List<T>::List(const FixedList<T, Size>& lst) Foam::List<T>::List(const FixedList<T, Size>& lst)
@ -534,6 +502,7 @@ void Foam::List<T>::operator=(const BiIndirectList<T>& lst)
} }
} }
// * * * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * // // * * * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * //
#include "ListIO.C" #include "ListIO.C"

6
src/OpenFOAM/containers/Lists/List/List.H
View File

@ -61,8 +61,10 @@ template<class T> Istream& operator>>(Istream&, List<T>&);
template<class T, unsigned Size> class FixedList; template<class T, unsigned Size> class FixedList;
template<class T> class PtrList; template<class T> class PtrList;
template<class T> class SLList; template<class T> class SLList;
template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv> template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
class DynamicList; class DynamicList;
template<class T> class SortableList; template<class T> class SortableList;
template<class T> class IndirectList; template<class T> class IndirectList;
template<class T> class UIndirectList; template<class T> class UIndirectList;
@ -120,10 +122,6 @@ public:
//- Construct as subset. //- Construct as subset.
List(const UList<T>&, const labelUList& mapAddressing); 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> //- Construct as copy of FixedList<T, Size>
template<unsigned Size> template<unsigned Size>
explicit List(const FixedList<T, Size>&); explicit List(const FixedList<T, Size>&);