aboutsummaryrefslogtreecommitdiffstats
path: root/libs/minisat/ParseUtils.h
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-07-25 03:31:16 +0200
committerClifford Wolf <clifford@clifford.at>2014-07-25 03:41:54 +0200
commit6789e3002aadb78623b9205492d14bbafb3e39eb (patch)
tree5f45f55e6a2410d309bc82a515a4889ff80bf38a /libs/minisat/ParseUtils.h
parente4a0ab9bedcf357551c0faf548317e0998d5a4d1 (diff)
downloadyosys-6789e3002aadb78623b9205492d14bbafb3e39eb.tar.gz
yosys-6789e3002aadb78623b9205492d14bbafb3e39eb.tar.bz2
yosys-6789e3002aadb78623b9205492d14bbafb3e39eb.zip
Removed Minisat dependency on zlib
Diffstat (limited to 'libs/minisat/ParseUtils.h')
-rw-r--r--libs/minisat/ParseUtils.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/libs/minisat/ParseUtils.h b/libs/minisat/ParseUtils.h
index 1c9e7bf7b..04911c70a 100644
--- a/libs/minisat/ParseUtils.h
+++ b/libs/minisat/ParseUtils.h
@@ -24,8 +24,6 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
#include <stdlib.h>
#include <stdio.h>
-#include <zlib.h>
-
#include "XAlloc.h"
namespace Minisat {
@@ -36,24 +34,16 @@ namespace Minisat {
class StreamBuffer {
- gzFile in;
unsigned char* buf;
int pos;
int size;
enum { buffer_size = 64*1024 };
- void assureLookahead() {
- if (pos >= size) {
- pos = 0;
- size = gzread(in, buf, buffer_size); } }
+ virtual void assureLookahead() = 0;
public:
- explicit StreamBuffer(gzFile i) : in(i), pos(0), size(0){
- buf = (unsigned char*)xrealloc(NULL, buffer_size);
- assureLookahead();
- }
- ~StreamBuffer() { free(buf); }
+ virtual ~StreamBuffer() { }
int operator * () const { return (pos >= size) ? EOF : buf[pos]; }
void operator ++ () { pos++; assureLookahead(); }