Fix some compiler warnings (2)

Author: kamahen

libcds/include/WaveletTreeNoptrsS.h

@@ -89,7 +89,7 @@ namespace cds_static
             uint set(uint val, uint ind) const;
 
             /** Recursive function for building the Wavelet Tree. */
-            void build_level(uint **bm, uint *symbols, uint length, uint *occs);
+            void build_level(uint **bm, uint *symbols, uint length);
     };
 };
 #endif

libcds/src/static/sequence/WaveletMatrix.cpp

@@ -24,9 +24,11 @@
 namespace cds_static
 {
 
-	WaveletMatrix::WaveletMatrix(const Array &symbols2, BitSequenceBuilder * bmb, Mapper * am) : Sequence(n) {
+	WaveletMatrix::WaveletMatrix(const Array &symbols2, BitSequenceBuilder * bmb, Mapper * am) : Sequence(0) {
 		bmb->use();
 		n = symbols2.getLength();
+		this->length = n; // sets Sequence::length (Sequence(0) in initializer)
+
 		uint *symbols = new uint[n];
 		this->am = am;
 		am->use();
@@ -81,8 +83,6 @@ namespace cds_static
 		delete [] _bm;
 		// delete [] oc;
 		bmb->unuse();
-
-		this->length = n;
 	}
 
 	WaveletMatrix::WaveletMatrix(uint * symbols, size_t n, BitSequenceBuilder * bmb, Mapper * am, bool deleteSymbols) : Sequence(n) {

libcds/src/static/sequence/WaveletTreeNoptrsS.cpp

@@ -24,9 +24,10 @@
 namespace cds_static
 {
 
-    WaveletTreeNoptrsS::WaveletTreeNoptrsS(const Array &symb, BitSequenceBuilder * bmb, Mapper * am) : Sequence(n) {
+    WaveletTreeNoptrsS::WaveletTreeNoptrsS(const Array &symb, BitSequenceBuilder * bmb, Mapper * am) : Sequence(0) {
         bmb->use();
         this->n=symb.getLength();
+        this->length = this->n; // sets Sequence::length (Sequence(0) in initializer)
         this->am=am;
         bool deleteSymbols = true;
         am->use();
@@ -80,7 +81,7 @@ namespace cds_static
                 _bm[i][j]=0;
         }
 
-        build_level(_bm,new_symb,new_n,occurrences);
+        build_level(_bm,new_symb,new_n);
         bitstring = new BitSequence*[height];
         for(uint i=0;i<height;i++) {
             bitstring[i] = bmb->build(_bm[i],new_n);
@@ -148,7 +149,7 @@ namespace cds_static
                 _bm[i][j]=0;
         }
 
-        build_level(_bm,new_symb,new_n,occurrences);
+        build_level(_bm,new_symb,new_n);
         bitstring = new BitSequence*[height];
         for(uint i=0;i<height;i++) {
             bitstring[i] = bmb->build(_bm[i],new_n);
@@ -328,7 +329,7 @@ namespace cds_static
         return bytesBitstrings+occ->getSize()+ptrs;
     }
 
-    void WaveletTreeNoptrsS::build_level(uint **bm, uint *symbols, uint length, uint *occs) {
+    void WaveletTreeNoptrsS::build_level(uint **bm, uint *symbols, uint length) {
             // for (uint i = 0; i < length; i++)
             //     cout << " " << symbols[i];
             // cout << endl;

libhdt/src/libdcs/CSD_FMIndex.cpp

@@ -54,7 +54,7 @@ CSD_FMIndex::CSD_FMIndex(hdt::IteratorUCharString *it, bool sparse_bitsequence,
 
   this->type = FMINDEX;
   string element;
-  unsigned char *text;
+  unsigned char *text; // TODO: std::vector<unsigned char>
   uint *bitmap = 0;
   // uint32_t *bitmap = 0;
 
@@ -149,7 +149,7 @@ CSD_FMIndex::CSD_FMIndex(hdt::IteratorUCharString *it, bool sparse_bitsequence,
     separators = new BitSequenceRG(bitmap, len, 4);
     delete[] bitmap;
   }
-  delete[] text;
+  free(text);
 }
 
 void CSD_FMIndex::build_ssa(unsigned char *text, size_t len,