Commit c4e2d27d authored by Jan Möbius's avatar Jan Möbius

Merge branch 'VS2015_Update3' into 'master'

Vs2015 update3



See merge request !74
parents 658632d8 59c0b6f1
Pipeline #2249 passed with stage
in 69 minutes and 44 seconds
......@@ -9,6 +9,12 @@
<tr valign=top><td><b>6.2</b> (?/?/?)</td><td>
<b>General</b>
<ul>
<li>Fixed build error with Visual Studio 2015 Update 3 (Fixed VS2015 Update 3 build error.</li>
</ul>
<b>Build System</b>
<ul>
<li>Fixed mingw compilataion error</li>
......
......@@ -83,10 +83,10 @@ public:
*/
//@{
/// Linear iterator
typedef Iterators::GenericIteratorT<This, This::VertexHandle, ArrayKernel, &This::has_vertex_status, &This::n_vertices> VertexIter;
typedef Iterators::GenericIteratorT<This, This::HalfedgeHandle, ArrayKernel, &This::has_halfedge_status, &This::n_halfedges> HalfedgeIter;
typedef Iterators::GenericIteratorT<This, This::EdgeHandle, ArrayKernel, &This::has_edge_status, &This::n_edges> EdgeIter;
typedef Iterators::GenericIteratorT<This, This::FaceHandle, ArrayKernel, &This::has_face_status, &This::n_faces> FaceIter;
typedef Iterators::GenericIteratorT<This, This::VertexHandle, ArrayKernel , &ArrayKernel::has_vertex_status, &ArrayKernel::n_vertices> VertexIter;
typedef Iterators::GenericIteratorT<This, This::HalfedgeHandle, ArrayKernel , &ArrayKernel::has_halfedge_status, &ArrayKernel::n_halfedges> HalfedgeIter;
typedef Iterators::GenericIteratorT<This, This::EdgeHandle, ArrayKernel , &ArrayKernel::has_edge_status, &ArrayKernel::n_edges> EdgeIter;
typedef Iterators::GenericIteratorT<This, This::FaceHandle, ArrayKernel , &ArrayKernel::has_face_status, &ArrayKernel::n_faces> FaceIter;
typedef VertexIter ConstVertexIter;
typedef HalfedgeIter ConstHalfedgeIter;
......
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