Merge pull request SINTEF-Geometry#361 from sbriseid/shared_build_fix

Shared build fix
sbriseid · Sep 18, 2024 · 634fb82 · 634fb82
2 parents 8886815 + 72fd820
commit 634fb82
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lrsplines2D/src/LRApproxApp.C b/lrsplines2D/src/LRApproxApp.C
@@ -365,7 +365,7 @@ void LRApproxApp::pointCloud2Spline(vector<double>& points,
     }
 }
 
-int compare_u_par(const void* el1, const void* el2)
+static int compare_u_par(const void* el1, const void* el2)
 {
   if (((double*)el1)[0] < ((double*)el2)[0])
     return -1;
@@ -375,7 +375,7 @@ int compare_u_par(const void* el1, const void* el2)
     return 0;
 }
 
-int compare_v_par(const void* el1, const void* el2)
+static int compare_v_par(const void* el1, const void* el2)
 {
   if (((double*)el1)[1] < ((double*)el2)[1])
     return -1;

diff --git a/lrsplines2D/src/TrimUtils.C b/lrsplines2D/src/TrimUtils.C
@@ -51,7 +51,7 @@ using std::pair;
 
 //#define DEBUG
 
-int compare_u_par_trim(const void* el1, const void* el2)
+static int compare_u_par(const void* el1, const void* el2)
 {
   if (((double*)el1)[0] < ((double*)el2)[0])
     return -1;
@@ -61,7 +61,7 @@ int compare_u_par_trim(const void* el1, const void* el2)
     return 0;
 }
 
-int compare_v_par_trim(const void* el1, const void* el2)
+static int compare_v_par(const void* el1, const void* el2)
 {
   if (((double*)el1)[1] < ((double*)el2)[1])
     return -1;
@@ -431,7 +431,7 @@ void TrimUtils::distributePointCloud(int ix1, int ix2,
   // Sort points in v-direction
   int nmb_pts = (ix2 - ix1)/del;
   double *points = points_+ix1;
-  qsort(points, nmb_pts, del*sizeof(double), compare_v_par_trim);
+  qsort(points, nmb_pts, del*sizeof(double), compare_v_par);
 
 #ifdef DEBUG
   std::ofstream of("division_lines.g2");
@@ -474,7 +474,7 @@ void TrimUtils::distributePointCloud(int ix1, int ix2,
 	}
 
       // Sort according to the u-parameter
-      qsort(points+pp0, (pp1-pp0)/del, del*sizeof(double), compare_u_par_trim);
+      qsort(points+pp0, (pp1-pp0)/del, del*sizeof(double), compare_u_par);
 
       for (kj=0, pp2=pp0, upar=domain[0]+u_del; kj<nmb_u;
 	   ++kj, upar+=u_del, pp2=pp3, ++kr)