Merge pull request XRPLF#260 from wankai/master

replace filter_block with std::unique_ptr to support RAII
vinniefalco · Sep 3, 2014 · 4b5ad88 · 4b5ad88
2 parents 9b976e3 + 19cc588
commit 4b5ad88
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/table/block_based_table_builder.cc b/table/block_based_table_builder.cc
@@ -401,7 +401,7 @@ struct BlockBasedTableBuilder::Rep {
   TableProperties props;
 
   bool closed = false;  // Either Finish() or Abandon() has been called.
-  FilterBlockBuilder* filter_block;
+  std::unique_ptr<FilterBlockBuilder> filter_block;
   char compressed_cache_key_prefix[BlockBasedTable::kMaxCacheKeyPrefixSize];
   size_t compressed_cache_key_prefix_size;
 
@@ -461,7 +461,6 @@ BlockBasedTableBuilder::BlockBasedTableBuilder(
 
 BlockBasedTableBuilder::~BlockBasedTableBuilder() {
   assert(rep_->closed);  // Catch errors where caller forgot to call Finish()
-  delete rep_->filter_block;
   delete rep_;
 }