From 528a11c635c949ba45c6c404a839b07c04079b2e Mon Sep 17 00:00:00 2001 From: Wankai Zhang Date: Thu, 28 Aug 2014 13:37:10 +0800 Subject: [PATCH] Update block_builder.h more c++11 way noncopyable and keep parameter's name of constructor consistent --- table/block_builder.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/table/block_builder.h b/table/block_builder.h index 2c8b9457f..c1e0cffc2 100644 --- a/table/block_builder.h +++ b/table/block_builder.h @@ -20,8 +20,11 @@ class Comparator; class BlockBuilder { public: - BlockBuilder(int block_builder, const Comparator* comparator); - + BlockBuilder(const BlockBuilder&) = delete; + void operator=(const BlockBuilder&) = delete; + + BlockBuilder(int block_restart_interval, const Comparator* comparator); + // Reset the contents as if the BlockBuilder was just constructed. void Reset(); @@ -55,10 +58,6 @@ class BlockBuilder { int counter_; // Number of entries emitted since restart bool finished_; // Has Finish() been called? std::string last_key_; - - // No copying allowed - BlockBuilder(const BlockBuilder&); - void operator=(const BlockBuilder&); }; } // namespace rocksdb