Merge remote-tracking branch 'origin/master' into topic/bernhard/hyperloglog

Conflicts:
	src/NetVar.cc
	src/NetVar.h

src/probabilistic/BloomFilter.cc

@@ -125,6 +125,11 @@ BasicBloomFilter::BasicBloomFilter(const Hasher* hasher, size_t cells)
 	bits = new BitVector(cells);
 	}
 
+BasicBloomFilter::~BasicBloomFilter()
+	{
+	delete bits;
+	}
+
 IMPLEMENT_SERIAL(BasicBloomFilter, SER_BASICBLOOMFILTER)
 
 bool BasicBloomFilter::DoSerialize(SerialInfo* info) const
@@ -173,6 +178,11 @@ CountingBloomFilter::CountingBloomFilter(const Hasher* hasher,
 	cells = new CounterVector(width, arg_cells);
 	}
 
+CountingBloomFilter::~CountingBloomFilter()
+	{
+	delete cells;
+	}
+
 bool CountingBloomFilter::Empty() const
 	{
 	return cells->AllZero();

src/probabilistic/BloomFilter.h

@@ -124,6 +124,11 @@ public:
 	 */
 	BasicBloomFilter(const Hasher* hasher, size_t cells);
 
+	/**
+	 * Destructor.
+	 */
+	~BasicBloomFilter();
+
 	/**
 	 * Computes the number of cells based on a given false positive rate
 	 * and capacity. In the literature, this parameter often has the name
@@ -192,6 +197,11 @@ public:
 	 */
 	CountingBloomFilter(const Hasher* hasher, size_t cells, size_t width);
 
+	/**
+	 * Destructor.
+	 */
+	~CountingBloomFilter();
+
 	// Overridden from BloomFilter.
 	virtual bool Empty() const;
 	virtual void Clear();