diff --git a/VERSION b/VERSION index 7dea76e..227cea2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +2.0.0 diff --git a/ref_read.h b/ref_read.h index 27cb7b0..9de097b 100644 --- a/ref_read.h +++ b/ref_read.h @@ -75,17 +75,6 @@ struct RefRecord { first = fgetc(in) ? true : false; } - RefRecord(int in, bool swap) { - off = readU(in, swap); - len = readU(in, swap); - char c; - if(!read(in, &c, 1)) { - cerr << "Error reading RefRecord 'first' flag" << endl; - throw 1; - } - first = (c ? true : false); - } - void write(std::ostream& out, bool be) { writeU(out, off, be); writeU(out, len, be); diff --git a/word_io.h b/word_io.h index cb5c67c..b2752a3 100644 --- a/word_io.h +++ b/word_io.h @@ -123,43 +123,5 @@ static inline T readI(FILE* in, bool swap) { } } -template -static inline T readU(int in, bool swap) { - T x; - if(read(in, (void *)&x, sizeof(T)) != sizeof(T)) { - assert(false); - } - if(swap) { - if(sizeof(T) == 4) { - return endianSwapU32(x); - } else if(sizeof(T) == 8) { - return endianSwapU64(x); - } else { - assert(false); - } - } else { - return x; - } -} - -template -static inline T readI(int in, bool swap) { - T x; - if(read(in, (void *)&x, sizeof(T)) != sizeof(T)) { - assert(false); - } - if(swap) { - if(sizeof(T) == 4) { - return endianSwapI32(x); - } else if(sizeof(T) == 8) { - return endianSwapI64(x); - } else { - assert(false); - } - } else { - return x; - } -} - #endif /*WORD_IO_H_*/