Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'VS2015_Update3' into 'master'

Browse Source 
Vs2015 update3



See merge request !74
This commit is contained in:
Jan Möbius
2016-06-30 14:26:35 +02:00
parent 658632d83a 59c0b6f16b
commit c4e2d27d33
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/changelog.docu
View File

@@ -9,6 +9,12 @@
<tr valign=top><td><b>6.2</b> (?/?/?)</td><td> <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> <b>Build System</b>
<ul> <ul>
<li>Fixed mingw compilataion error</li> <li>Fixed mingw compilataion error</li>

8
src/OpenMesh/Core/Mesh/PolyConnectivity.hh
View File

@@ -83,10 +83,10 @@ public:
*/ */
//@{ //@{
/// Linear iterator /// Linear iterator
typedef Iterators::GenericIteratorT<This, This::VertexHandle, ArrayKernel, &This::has_vertex_status, &This::n_vertices> VertexIter; typedef Iterators::GenericIteratorT<This, This::VertexHandle, ArrayKernel , &ArrayKernel::has_vertex_status, &ArrayKernel::n_vertices> VertexIter;
typedef Iterators::GenericIteratorT<This, This::HalfedgeHandle, ArrayKernel, &This::has_halfedge_status, &This::n_halfedges> HalfedgeIter; typedef Iterators::GenericIteratorT<This, This::HalfedgeHandle, ArrayKernel , &ArrayKernel::has_halfedge_status, &ArrayKernel::n_halfedges> HalfedgeIter;
typedef Iterators::GenericIteratorT<This, This::EdgeHandle, ArrayKernel, &This::has_edge_status, &This::n_edges> EdgeIter; typedef Iterators::GenericIteratorT<This, This::EdgeHandle, ArrayKernel , &ArrayKernel::has_edge_status, &ArrayKernel::n_edges> EdgeIter;
typedef Iterators::GenericIteratorT<This, This::FaceHandle, ArrayKernel, &This::has_face_status, &This::n_faces> FaceIter; typedef Iterators::GenericIteratorT<This, This::FaceHandle, ArrayKernel , &ArrayKernel::has_face_status, &ArrayKernel::n_faces> FaceIter;
typedef VertexIter ConstVertexIter; typedef VertexIter ConstVertexIter;
typedef HalfedgeIter ConstHalfedgeIter; typedef HalfedgeIter ConstHalfedgeIter;