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

Patch to work with gcc 4.6. ptrdiff_t not correctly included from std, Thanks to Ville Heiskanen for the patch)

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@360 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2011-01-05 09:52:58 +00:00
parent 30fb80d549
commit b63dcd31bd
2 changed files with 172 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/OpenMesh/Core/Mesh/CirculatorsT.hh
View File

@@ -53,6 +53,7 @@
#include <OpenMesh/Core/System/config.h>
#include <assert.h>
#include <cstddef>
//== NAMESPACES ===============================================================
@@ -110,14 +111,14 @@ class VertexVertexIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Vertex& reference;
typedef const typename Mesh::Vertex* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Vertex& reference;
@@ -304,14 +305,14 @@ class ConstVertexVertexIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Vertex& reference;
typedef const typename Mesh::Vertex* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Vertex& reference;
@@ -498,14 +499,14 @@ class VertexOHalfedgeIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
@@ -692,14 +693,14 @@ class ConstVertexOHalfedgeIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
@@ -886,14 +887,14 @@ class VertexIHalfedgeIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
@@ -1080,14 +1081,14 @@ class ConstVertexIHalfedgeIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
@@ -1274,14 +1275,14 @@ class VertexEdgeIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Edge& reference;
typedef const typename Mesh::Edge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Edge& reference;
@@ -1468,14 +1469,14 @@ class ConstVertexEdgeIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Edge& reference;
typedef const typename Mesh::Edge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Edge& reference;
@@ -1662,14 +1663,14 @@ class VertexFaceIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Face& reference;
typedef const typename Mesh::Face* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Face& reference;
@@ -1854,14 +1855,14 @@ class ConstVertexFaceIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Face& reference;
typedef const typename Mesh::Face* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Face& reference;
@@ -2046,14 +2047,14 @@ class FaceVertexIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Vertex& reference;
typedef const typename Mesh::Vertex* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Vertex& reference;
@@ -2240,14 +2241,14 @@ class ConstFaceVertexIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Vertex& reference;
typedef const typename Mesh::Vertex* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Vertex& reference;
@@ -2434,14 +2435,14 @@ class FaceHalfedgeIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
@@ -2628,14 +2629,14 @@ class ConstFaceHalfedgeIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Halfedge& reference;
typedef const typename Mesh::Halfedge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Halfedge& reference;
@@ -2822,14 +2823,14 @@ class FaceEdgeIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Edge& reference;
typedef const typename Mesh::Edge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Edge& reference;
@@ -3016,14 +3017,14 @@ class ConstFaceEdgeIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Edge& reference;
typedef const typename Mesh::Edge* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Edge& reference;
@@ -3210,14 +3211,14 @@ class FaceFaceIterT
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Face& reference;
typedef const typename Mesh::Face* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Face& reference;
@@ -3402,14 +3403,14 @@ class ConstFaceFaceIterT
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const Mesh& mesh_ref;
typedef const Mesh* mesh_ptr;
typedef const typename Mesh::Face& reference;
typedef const typename Mesh::Face* pointer;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef Mesh& mesh_ref;
typedef Mesh* mesh_ptr;
typedef typename Mesh::Face& reference;

33
src/OpenMesh/Core/Mesh/IteratorsT.hh
View File

@@ -55,6 +55,7 @@
#include <OpenMesh/Core/System/config.h>
#include <OpenMesh/Core/Mesh/Status.hh>
#include <assert.h>
#include <cstddef>
//== NAMESPACES ===============================================================
@@ -98,14 +99,14 @@ public:
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -265,14 +266,14 @@ public:
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -434,14 +435,14 @@ public:
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -603,14 +604,14 @@ public:
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -772,14 +773,14 @@ public:
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -941,14 +942,14 @@ public:
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -1110,14 +1111,14 @@ public:
#if 0
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;
@@ -1279,14 +1280,14 @@ public:
#if 1
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef const value_type& reference;
typedef const value_type* pointer;
typedef const Mesh* mesh_ptr;
typedef const Mesh& mesh_ref;
#else
typedef std::bidirectional_iterator_tag iterator_category;
typedef ptrdiff_t difference_type;
typedef std::ptrdiff_t difference_type;
typedef value_type& reference;
typedef value_type* pointer;
typedef Mesh* mesh_ptr;