diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2013-12-11 12:52:41 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2013-12-11 12:52:41 +0000 |
commit | 8873c15fe584b87292779f18dcc1a12eb1dcc3c1 (patch) | |
tree | 58a2702517f0e82f5fbab37ea77d8260e3f4e915 /db/version_set.h | |
parent | 7e123e2bf36778c8ea448a493a417410a165155f (diff) | |
parent | 4935bf087b28aa308c0a820720b85ef695e236ae (diff) | |
download | src-8873c15fe584b87292779f18dcc1a12eb1dcc3c1.tar.gz |
Merge third_party/leveldatabase/src from https://chromium.googlesource.com/external/leveldb.git at 4935bf087b28aa308c0a820720b85ef695e236ae
This commit was generated by merge_from_chromium.py.
Change-Id: I7839b6291c3fd82fb3cccf26a28d2d4ba6eb3228
Diffstat (limited to 'db/version_set.h')
-rw-r--r-- | db/version_set.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/db/version_set.h b/db/version_set.h index 20de0e2..8dc14b8 100644 --- a/db/version_set.h +++ b/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_; |