Commit b83171ff authored by Mike Kremer's avatar Mike Kremer
Browse files

Corrected sugnature of base iterator class constructor

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@49 66977474-1d4b-4f09-8fe9-267525286df2
parent 0ecda84c
......@@ -57,7 +57,7 @@ class CellSheetCellIter : public BaseIterator<VecT,
private:
typedef BaseIterator<VecT,
typename PolyhedralMesh<VecT>::CellHandle,
typename PolyhedralMesh<VecT>::CellHandle> BaseIter;
typename PolyhedralMesh<VecT>::CellHandle> BaseIter;
typedef typename PolyhedralMesh<VecT>::CellHandle CellHandle;
typedef typename PolyhedralMesh<VecT>::HalfFaceHandle HalfFaceHandle;
public:
......
......@@ -122,11 +122,9 @@ class OpenVolumeMeshCell;
/*
* TODO:
*
* - Implement garbage collection
* - Make vertex points, edges, faces, etc.
* be default properties
* - Make status be a dynamic property for each entity
* - Put all OpenVolumeMesh stuff into its own namespace
*/
//***************************************************************************
......
......@@ -65,8 +65,11 @@ public:
typedef OH* pointer;
typedef OH& reference;
BaseIterator(const PolyhedralMesh<VecT>* _mesh, const IH& _ih = -1, const OH& _ch = -1) :
valid_(true), cur_handle_(_ch), ref_handle_(_ih), mesh_(_mesh) {}
BaseIterator(const PolyhedralMesh<VecT>* _mesh, const IH& _ih, const OH& _ch);
BaseIterator(const PolyhedralMesh<VecT>* _mesh, const IH& _ih);
BaseIterator(const PolyhedralMesh<VecT>* _mesh);
// STL compliance (needs to have default constructor)
BaseIterator() : valid_(false), mesh_(0) {}
......
......@@ -49,6 +49,28 @@
namespace OpenVolumeMesh {
//================================================================================================
// BaseIterator
//================================================================================================
template <class VecT, class IH, class OH>
BaseIterator<VecT,IH,OH>::BaseIterator(const PolyhedralMesh<VecT>* _mesh, const IH& _ih, const OH& _ch) :
valid_(true), cur_handle_(_ch), ref_handle_(_ih), mesh_(_mesh) {
}
template <class VecT, class IH, class OH>
BaseIterator<VecT,IH,OH>::BaseIterator(const PolyhedralMesh<VecT>* _mesh, const IH& _ih) :
valid_(true), ref_handle_(_ih), mesh_(_mesh) {
}
template <class VecT, class IH, class OH>
BaseIterator<VecT,IH,OH>::BaseIterator(const PolyhedralMesh<VecT>* _mesh) :
valid_(true), mesh_(_mesh) {
}
//================================================================================================
// VertexOHalfedgeIter
//================================================================================================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment