Merge 1e6b5009c9 into ac691084fd

include/leveldb/cache.h

@@ -79,6 +79,7 @@ class LEVELDB_EXPORT Cache {
   // underlying entry will be kept around until all existing handles
   // to it have been released.
   virtual void Erase(const Slice& key) = 0;
+  virtual void AddSome(const Entity& value) = 0;
 
   // Return a new numeric id.  May be used by multiple clients who are
   // sharing the same cache to partition the key space.  Typically the

include/leveldb/comparator.h

@@ -25,7 +25,7 @@ class LEVELDB_EXPORT Comparator {
   //   < 0 iff "a" < "b",
   //   == 0 iff "a" == "b",
   //   > 0 iff "a" > "b"
-  virtual int Compare(const Slice& a, const Slice& b) const = 0;
+  virtual int Compare(const Slice& a, const Slice& c) const = 0;
 
   // The name of the comparator.  Used to check for comparator
   // mismatches (i.e., a DB created with one comparator is