From 8d48b47450f5e62a7db1766da57d5736872077a9 Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <mithro@mithis.com>
Date: Fri, 24 Nov 2017 15:30:55 +1100
Subject: minisat: Remove template with gzFile specialization.
All the other gzFile functions have been removed but this template was
still left around.
---
libs/minisat/00_PATCH_remove_zlib.patch | 17 +++++++++++++++++
libs/minisat/Dimacs.h | 8 ++++----
2 files changed, 21 insertions(+), 4 deletions(-)
(limited to 'libs')
diff --git a/libs/minisat/00_PATCH_remove_zlib.patch b/libs/minisat/00_PATCH_remove_zlib.patch
index 61a36f7e5..068356b73 100644
--- a/libs/minisat/00_PATCH_remove_zlib.patch
+++ b/libs/minisat/00_PATCH_remove_zlib.patch
@@ -36,3 +36,20 @@
int operator * () const { return (pos >= size) ? EOF : buf[pos]; }
void operator ++ () { pos++; assureLookahead(); }
+--- Dimacs.h
++++ Dimacs.h
+@@ -76,10 +76,10 @@ static void parse_DIMACS_main(B& in, Solver& S, bool strictp = false) {
+
+ // Inserts problem into solver.
+ //
+-template<class Solver>
+-static void parse_DIMACS(gzFile input_stream, Solver& S, bool strictp = false) {
+- StreamBuffer in(input_stream);
+- parse_DIMACS_main(in, S, strictp); }
++//template<class Solver>
++//static void parse_DIMACS(gzFile input_stream, Solver& S, bool strictp = false) {
++// StreamBuffer in(input_stream);
++// parse_DIMACS_main(in, S, strictp); }
+
+ //=================================================================================================
+ }
diff --git a/libs/minisat/Dimacs.h b/libs/minisat/Dimacs.h
index ccfa1c013..61b9d3ca0 100644
--- a/libs/minisat/Dimacs.h
+++ b/libs/minisat/Dimacs.h
@@ -76,10 +76,10 @@ static void parse_DIMACS_main(B& in, Solver& S, bool strictp = false) {
// Inserts problem into solver.
//
-template<class Solver>
-static void parse_DIMACS(gzFile input_stream, Solver& S, bool strictp = false) {
- StreamBuffer in(input_stream);
- parse_DIMACS_main(in, S, strictp); }
+//template<class Solver>
+//static void parse_DIMACS(gzFile input_stream, Solver& S, bool strictp = false) {
+// StreamBuffer in(input_stream);
+// parse_DIMACS_main(in, S, strictp); }
//=================================================================================================
}
--
cgit v1.2.3