File add-return-to-nonvoid-functions.patch of Package tulip

Overview Repositories Revisions Requests Users Attributes Meta

File add-return-to-nonvoid-functions.patch of Package tulip (Revision e54d4850ce33afb562da68a7d86caeaa)

Currently displaying revision e54d4850ce33afb562da68a7d86caeaa , Show latest

diff -wruN -x '*~' ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/common/shapes.cc ./plugins/clustering/Delaunay/poly2tri/common/shapes.cc
--- ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/common/shapes.cc	2012-02-21 12:23:35.000000000 +0100
+++ ./plugins/clustering/Delaunay/poly2tri/common/shapes.cc	2012-02-22 13:35:03.000000000 +0100
@@ -164,6 +164,7 @@
     return 2;
   }
   assert(0);
+  return -1;
 }
 
 int Triangle::EdgeIndex(const Point* p1, const Point* p2)
@@ -223,6 +224,7 @@
     return points_[1];
   }
   assert(0);
+  return NULL;
 }
 
 // The point counter-clockwise to given point
@@ -236,6 +238,7 @@
     return points_[0];
   }
   assert(0);
+  return NULL;
 }
 
 // The neighbor clockwise to given point
diff -wruN -x '*~' ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc ./plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc
--- ../orig-tulip-3.7.0-src/plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc	2012-02-21 12:23:35.000000000 +0100
+++ ./plugins/clustering/Delaunay/poly2tri/sweep/sweep.cc	2012-02-22 13:07:19.000000000 +0100
@@ -714,6 +714,7 @@
     //throw new RuntimeException("[Unsupported] Opposing point on constrained edge");
     assert(0);
   }
+  return ep; // just to please GCC
 }
 
 void Sweep::FlipScanEdgeEvent(SweepContext& tcx, Point& ep, Point& eq, Triangle& flip_triangle,

Places

File add-return-to-nonvoid-functions.patch of Package tulip (Revision e54d4850ce33afb562da68a7d86caeaa)

Places