From: Igor Canadi Date: Tue, 7 Oct 2014 16:47:16 +0000 (-0700) Subject: Fix error introduced by merge X-Git-Tag: v3.6.1~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63eade401a880e531d86f325c9553cdecd01853c;p=rocksdb.git Fix error introduced by merge --- diff --git a/utilities/write_batch_with_index/write_batch_with_index.cc b/utilities/write_batch_with_index/write_batch_with_index.cc index f5bab263..481ec686 100644 --- a/utilities/write_batch_with_index/write_batch_with_index.cc +++ b/utilities/write_batch_with_index/write_batch_with_index.cc @@ -10,6 +10,7 @@ #include "util/arena.h" namespace rocksdb { + class ReadableWriteBatch : public WriteBatch { public: explicit ReadableWriteBatch(size_t reserved_bytes = 0) @@ -120,7 +121,6 @@ class WBWIIteratorImpl : public WBWIIterator { } } }; -} // namespace struct WriteBatchWithIndex::Rep { Rep(const Comparator* index_comparator, size_t reserved_bytes = 0)