File gmsh-return-values-fix.patch of Package gmsh

Overview Repositories Revisions Requests Users Attributes Meta

File gmsh-return-values-fix.patch of Package gmsh

diff -u -r gmsh-2.5.0-source.orig/Plugin/AnalyseCurvedMesh.cpp gmsh-2.5.0-source/Plugin/AnalyseCurvedMesh.cpp
--- gmsh-2.5.0-source.orig/Plugin/AnalyseCurvedMesh.cpp	2010-11-18 11:13:48.551740925 +0100
+++ gmsh-2.5.0-source/Plugin/AnalyseCurvedMesh.cpp	2010-11-18 11:13:36.483738345 +0100
@@ -472,7 +472,6 @@
           Msg::Info("Element %d may be bad", el[i]->getNum());
         }
       }
-      return a;
 
     case 2 :
       std::vector<int> tag(numEl, UNDEF_JAC_TAG);
@@ -500,8 +499,9 @@
       }
 
       Msg::Info(" ");
-      return a;
   }
+
+  return a;
 }
 
 
diff -u -r gmsh-2.5.0-source.orig/Solver/multiscaleLaplace.cpp gmsh-2.5.0-source/Solver/multiscaleLaplace.cpp
--- gmsh-2.5.0-source.orig/Solver/multiscaleLaplace.cpp	2010-10-15 15:35:00.000000000 +0200
+++ gmsh-2.5.0-source/Solver/multiscaleLaplace.cpp	2010-11-18 10:43:57.579741799 +0100
@@ -53,6 +53,10 @@
 
 
 //--------------------------------------------------------------
+// Weird: this static function seems not to be used anywhere, it
+// calculates the values PQ1, PQ2, QP1, QP2 without using them at all
+// and it does not define its return value.  Fix at least the return
+// value to make the compiler happy.
 static int intersection_segments_b (SPoint2 &p1, SPoint2 &p2,
                                     SPoint2 &q1, SPoint2 &q2, 
                                     double x[2]){
@@ -67,6 +71,7 @@
   double QP1 = robustPredicates::orient2d(Q1,Q2,P1);
   double QP2 = robustPredicates::orient2d(Q1,Q2,P2);
 
+  return -42;
 }
 //--------------------------------------------------------------
 static void recur_connect (MVertex *v,

Places

File gmsh-return-values-fix.patch of Package gmsh

Places