- Timestamp:
- Apr 29, 2013, 6:56:17 AM (6 years ago)
- Location:
- trunk/lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/pabloSupport.hpp
r3087 r3093 118 118 } 119 119 120 IDISA_ALWAYS_INLINE BitBlock pablo_blk_match(uint8_t bytedata[], const charmatch_str[], BitBlock v, int len) {120 template <typename T> IDISA_ALWAYS_INLINE BitBlock pablo_blk_match(T bytedata[], const T match_str[], BitBlock v, int len) { 121 121 union {BitBlock bitblock; ScanWord elems[sizeof(BitBlock)/sizeof(ScanWord)];} u; 122 122 u.bitblock = v; … … 129 129 t = s; 130 130 s = s & (s - 1); // clear rightmost bit 131 if (memcmp((void *) &bytedata[pos], (void *) match_str, len )) {131 if (memcmp((void *) &bytedata[pos], (void *) match_str, len * sizeof(T))) { 132 132 // Strings do not match; filter the result. 133 133 bit = s ^ t; -
trunk/lib/transpose.hpp
r3088 r3093 40 40 struct Transpose { 41 41 Transpose() {} 42 void do_block( Bytedata &bytedata, Basis_bits & basis_bits) {42 void do_block(char * bytedata, Basis_bits & basis_bits) { 43 43 s2p_do_block((BytePack *) bytedata, basis_bits); 44 44 } 45 void do_final_block( Bytedata &bytedata, Basis_bits & basis_bits, BitBlock EOF_mask) {45 void do_final_block(char * bytedata, Basis_bits & basis_bits, BitBlock EOF_mask) { 46 46 s2p_do_final_block((BytePack *) bytedata, basis_bits, EOF_mask); 47 47 }
Note: See TracChangeset
for help on using the changeset viewer.