Merge src/leveldb changes for LevelDB 1.15

2013-12-12 22:08:18 +01:00
parent fb34be6d59 55c6890294
commit ed873a301e
31 changed files with 449 additions and 366 deletions
--- a/src/leveldb/db/version_set.h
+++ b/src/leveldb/db/version_set.h
@@ -292,8 +292,6 @@ class VersionSet {

  void AppendVersion(Version* v);

-  bool ManifestContains(const std::string& record) const;
-
  Env* const env_;
  const std::string dbname_;
  const Options* const options_;