diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2015-05-05 21:54:29 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2015-05-05 21:54:29 +0000 |
commit | bef4dc1626df6695999d63c39a4f13d2e2e70522 (patch) | |
tree | ab4afd56497d5c009d45f5d8774ed20e663f98aa /math/py-cryptominisat/files/patch-pycryptosat.cpp | |
parent | Restore rebar dependency. (diff) |
math/cryptominisat, math/py-cryptominisat: add new ports
CryptoMiniSat is a modern, multi-threaded, feature-rich, simplifying SAT
solver, featuring over 100 configurable parameters to tune to specific
need, collection of statistical data to MySQL database + javascript-based
visualization of it and clean C++ and python interfaces.
WWW: http://www.msoos.org/cryptominisat4/
PR: 199929
Submitted by: 6yearold@gmail.com (based on)
Notes
Notes:
svn path=/head/; revision=385495
Diffstat (limited to 'math/py-cryptominisat/files/patch-pycryptosat.cpp')
-rw-r--r-- | math/py-cryptominisat/files/patch-pycryptosat.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/math/py-cryptominisat/files/patch-pycryptosat.cpp b/math/py-cryptominisat/files/patch-pycryptosat.cpp new file mode 100644 index 000000000000..7d6b9d31f49c --- /dev/null +++ b/math/py-cryptominisat/files/patch-pycryptosat.cpp @@ -0,0 +1,19 @@ +On FreeBSD -std=c++11 turns NULL into nullptr which sometimes breaks: + + pycryptosat.cpp:393:12: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t' + return NULL; + ^~~~ + /usr/include/sys/_null.h:35:14: note: expanded from macro 'NULL' + #define NULL nullptr + ^~~~~~~ +--- pycryptosat.cpp.orig 2014-07-06 23:41:16 UTC ++++ pycryptosat.cpp +@@ -390,7 +390,7 @@ Solver_init(Solver *self, PyObject *args + if (!self->cmsat) { + return -1; + } +- return NULL; ++ return 0; + } + + static PyMemberDef Solver_members[] = { |