diff options
Diffstat (limited to 'table/table_test.cc')
-rw-r--r-- | table/table_test.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/table/table_test.cc b/table/table_test.cc index abf6e24..e47db3d 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -172,7 +172,7 @@ class Constructor { virtual const KVMap& data() { return data_; } - virtual DB* db() const { return NULL; } // Overridden in DBConstructor + virtual DB* db() const { return nullptr; } // Overridden in DBConstructor private: KVMap data_; @@ -183,13 +183,13 @@ class BlockConstructor: public Constructor { explicit BlockConstructor(const Comparator* cmp) : Constructor(cmp), comparator_(cmp), - block_(NULL) { } + block_(nullptr) { } ~BlockConstructor() { delete block_; } virtual Status FinishImpl(const Options& options, const KVMap& data) { delete block_; - block_ = NULL; + block_ = nullptr; BlockBuilder builder(&options); for (KVMap::const_iterator it = data.begin(); @@ -222,7 +222,7 @@ class TableConstructor: public Constructor { public: TableConstructor(const Comparator* cmp) : Constructor(cmp), - source_(NULL), table_(NULL) { + source_(nullptr), table_(nullptr) { } ~TableConstructor() { Reset(); @@ -262,8 +262,8 @@ class TableConstructor: public Constructor { void Reset() { delete table_; delete source_; - table_ = NULL; - source_ = NULL; + table_ = nullptr; + source_ = nullptr; } StringSource* source_; @@ -351,7 +351,7 @@ class DBConstructor: public Constructor { explicit DBConstructor(const Comparator* cmp) : Constructor(cmp), comparator_(cmp) { - db_ = NULL; + db_ = nullptr; NewDB(); } ~DBConstructor() { @@ -359,7 +359,7 @@ class DBConstructor: public Constructor { } virtual Status FinishImpl(const Options& options, const KVMap& data) { delete db_; - db_ = NULL; + db_ = nullptr; NewDB(); for (KVMap::const_iterator it = data.begin(); it != data.end(); @@ -436,11 +436,11 @@ static const int kNumTestArgs = sizeof(kTestArgList) / sizeof(kTestArgList[0]); class Harness { public: - Harness() : constructor_(NULL) { } + Harness() : constructor_(nullptr) { } void Init(const TestArgs& args) { delete constructor_; - constructor_ = NULL; + constructor_ = nullptr; options_ = Options(); options_.block_restart_interval = args.restart_interval; @@ -636,7 +636,7 @@ class Harness { } } - // Returns NULL if not running against a DB + // Returns nullptr if not running against a DB DB* db() const { return constructor_->db(); } private: |