[Bf-blender-cvs] [41722bfaa6e] newboolean: Fix a strange merge problem, and fix a couple of warnings.

[Howard Trickey]

Commit: 41722bfaa6ea90291d0a616db1bbc5fca59bf2b4
Author: Howard Trickey
Date:   Sat Jul 18 19:58:41 2020 -0400
Branches: newboolean
https://developer.blender.org/rB41722bfaa6ea90291d0a616db1bbc5fca59bf2b4

Fix a strange merge problem, and fix a couple of warnings.

===================================================================

M	source/blender/blenlib/intern/math_vec.cc
M	source/blender/blenlib/intern/mesh_intersect.cc

===================================================================

diff --git a/source/blender/blenlib/intern/math_vec.cc b/source/blender/blenlib/intern/math_vec.cc
index c18146c2a8a..55dd8b268cb 100644
--- a/source/blender/blenlib/intern/math_vec.cc
+++ b/source/blender/blenlib/intern/math_vec.cc
@@ -623,7 +623,8 @@ void exactinit()
  *  Sets h = e + f.  See the long version of my paper for details.
  * h cannot be e or f.
  */
-static int fast_expansion_sum_zeroelim(int elen, double *e, int flen, double *f, double *h)
+static int fast_expansion_sum_zeroelim(
+    int elen, const double *e, int flen, const double *f, double *h)
 {
   double Q;
   INEXACT double Qnew;
@@ -702,7 +703,7 @@ static int fast_expansion_sum_zeroelim(int elen, double *e, int flen, double *f,
  *  Sets h = be.  See either version of my paper for details.
  *  e and h cannot be the same.
  */
-static int scale_expansion_zeroelim(int elen, double *e, double b, double *h)
+static int scale_expansion_zeroelim(int elen, const double *e, double b, double *h)
 {
   INEXACT double Q, sum;
   double hh;
@@ -742,7 +743,7 @@ static int scale_expansion_zeroelim(int elen, double *e, double b, double *h)
 }
 
 /*  estimate()   Produce a one-word estimate of an expansion's value. */
-static double estimate(int elen, double *e)
+static double estimate(int elen, const double *e)
 {
   double Q;
   int eindex;
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc
index 15012ff9342..47daa1cbe48 100644
--- a/source/blender/blenlib/intern/mesh_intersect.cc
+++ b/source/blender/blenlib/intern/mesh_intersect.cc
@@ -1249,7 +1249,7 @@ static int index_orient3d = 11;
  * mpq3 test would also have returned that value.
  * When the return value is 0, we are not sure of the sign.
  */
-int fliter_orient3d(const double3 &a, const double3 &b, const double3 &c, const double3 &d)
+static int fliter_orient3d(const double3 &a, const double3 &b, const double3 &c, const double3 &d)
 {
   double o3dfast = double3::orient3d_fast(a, b, c, d);
   if (o3dfast == 0.0) {
@@ -1267,7 +1267,7 @@ int fliter_orient3d(const double3 &a, const double3 &b, const double3 &c, const
  * mpq3 test would also have returned that value.
  * When the return value is 0, we are not sure of the sign.
  */
-int filter_tri_plane_vert_orient3d(const Face &tri, Vertp v)
+static int filter_tri_plane_vert_orient3d(const Face &tri, Vertp v)
 {
   return fliter_orient3d(tri[0]->co, tri[1]->co, tri[2]->co, v->co);
 }
@@ -2049,7 +2049,7 @@ static bool bvhtreeverlap_cmp(const BVHTreeOverlap &a, const BVHTreeOverlap &b)
   if (a.indexA < b.indexA) {
     return true;
   }
-  if (a.indexA == b.indexA & a.indexB < b.indexB) {
+  if ((a.indexA == b.indexA) & (a.indexB < b.indexB)) {
     return true;
   }
   return false;