Friends may not add default arguments.

2 files changed, 27 insertions, 1 deletions

diff --git a/math/minisat/distinfo b/math/minisat/distinfo
index 9a46548d7bc..58dffae5869 100644
--- a/math/minisat/distinfo
+++ b/math/minisat/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2013/10/28 04:15:11 asau Exp $
+$NetBSD: distinfo,v 1.2 2013/11/08 21:15:02 joerg Exp $
 
 SHA1 (minisat-2.2.0.tar.gz) = dfc25898bf40e00cf04252a42176e0c0600fbc90
 RMD160 (minisat-2.2.0.tar.gz) = 169ec9116befa9067db9076d26309f7e9ab408dd
 Size (minisat-2.2.0.tar.gz) = 43879 bytes
+SHA1 (patch-core_SolverTypes.h) = 969937eaaaac60b5e2b415ce3282797daacc4890
 SHA1 (patch-utils_System.cc) = 74c1af06a8a8c6f0ec85fc55cfb3d7060ee9a141
diff --git a/math/minisat/patches/patch-core_SolverTypes.h b/math/minisat/patches/patch-core_SolverTypes.h
new file mode 100644
index 00000000000..27895a582e6
--- /dev/null
+++ b/math/minisat/patches/patch-core_SolverTypes.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-core_SolverTypes.h,v 1.1 2013/11/08 21:15:02 joerg Exp $
+
+--- core/SolverTypes.h.orig	2013-11-08 20:45:57.000000000 +0000
++++ core/SolverTypes.h
+@@ -42,18 +42,18 @@ namespace Minisat {
+ typedef int Var;
+ #define var_Undef (-1)
+ 
+-
+ struct Lit {
+     int     x;
+ 
+     // Use this as a constructor:
+-    friend Lit mkLit(Var var, bool sign = false);
++    friend Lit mkLit(Var var, bool sign);
+ 
+     bool operator == (Lit p) const { return x == p.x; }
+     bool operator != (Lit p) const { return x != p.x; }
+     bool operator <  (Lit p) const { return x < p.x;  } // '<' makes p, ~p adjacent in the ordering.
+ };
+ 
++Lit mkLit(Var var, bool sign = false);
+ 
+ inline  Lit  mkLit     (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
+ inline  Lit  operator ~(Lit p)              { Lit q; q.x = p.x ^ 1; return q; }