Package: meshlab / 1.3.2+dfsg1-4

gcc-6.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
Description: Fix compilation with g++-6
 This patch might require that -std=c++11 is set.
Bug-Debian: https://bugs.debian.org/811634
Author: Gert Wollny <gw.fossdev@gmail.com>
Last-Update: 2016-06-27
--- a/meshlab/src/common/GLLogStream.h
+++ b/meshlab/src/common/GLLogStream.h
@@ -51,7 +51,7 @@
 	void Logf(int Level, const char * f, ... );
   void Log(int Level, const char * buf )
 	{
-		S.push_back(std::make_pair<int,QString>(Level,buf));
+		S.push_back(std::make_pair(Level,buf));
     qDebug("LOG: %i %s",Level,buf);
 	}
 
--- a/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
+++ b/meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp
@@ -122,7 +122,7 @@
 						currentT = p;
 
 						// We do not intersect grid.
-						if (!found) return false;
+						if (!found) return NULL;
 				}
 
 				stepX = (dir.x() > 0) ? 1 : -1;
--- a/vcglib/vcg/complex/algorithms/clean.h
+++ b/vcglib/vcg/complex/algorithms/clean.h
@@ -28,6 +28,7 @@
 #include <map>
 #include <algorithm>
 #include <stack>
+#include <utility>
 
 // VCG headers
 #include <vcg/simplex/face/pos.h>
@@ -1703,7 +1704,7 @@
 						Allocator<MeshType>::DeleteFace(m,(**fpvi));
         }
       }
-			return std::make_pair<int,int>(TotalCC,DeletedCC);
+      return std::make_pair(TotalCC,DeletedCC);
 }
 
 
@@ -1734,7 +1735,7 @@
 						tri::Allocator<MeshType>::DeleteFace(m,(**fpvi));
         }
       }
-			return std::make_pair<int,int>(TotalCC,DeletedCC);
+			return std::make_pair(TotalCC,DeletedCC);
 }
 
 /// Remove the connected components greater than a given diameter
@@ -1764,7 +1765,7 @@
 						tri::Allocator<MeshType>::DeleteFace(m,(**fpvi));
         }
       }
-			return std::make_pair<int,int>(TotalCC,DeletedCC);
+			return std::make_pair(TotalCC,DeletedCC);
 }
 
 		}; // end class
--- a/vcglib/vcg/math/base.h
+++ b/vcglib/vcg/math/base.h
@@ -94,7 +94,7 @@
 /// static_assert: implemented as a macro for "assert", but it is separated for clarity.
 /// Should be used for checking integrity constraints that can be tested at complile time,
 /// as the ones involving templated constants in templated classes.
-#define static_assert assert
+//#define static_assert assert
 
   #ifdef __BORLANDC__
     float sqrtf (float v) {return sqrt(v);}