import quincy beta 17.1.0

[ceph.git] / ceph / src / rocksdb / util / comparator.cc

diff --git a/ceph/src/rocksdb/util/comparator.cc b/ceph/src/rocksdb/util/comparator.cc
index 48340bd9697d64c1e5c1137dca49ae6bd2c04f89..96e770489b49d14cce3b295f1c78d604a9cea81b 100644 (file)
--- a/ceph/src/rocksdb/util/comparator.cc
+++ b/ceph/src/rocksdb/util/comparator.cc
@@ -11,7 +11,6 @@
 #include <stdint.h>
 #include <algorithm>
 #include <memory>
-#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/slice.h"
 
@@ -125,7 +124,9 @@ class BytewiseComparatorImpl : public Comparator {
     return false;
   }
 
-  int CompareWithoutTimestamp(const Slice& a, const Slice& b) const override {
+  using Comparator::CompareWithoutTimestamp;
+  int CompareWithoutTimestamp(const Slice& a, bool /*a_has_ts*/, const Slice& b,
+                              bool /*b_has_ts*/) const override {
     return a.compare(b);
   }
 };
@@ -197,7 +198,9 @@ class ReverseBytewiseComparatorImpl : public BytewiseComparatorImpl {
     return false;
   }
 
-  int CompareWithoutTimestamp(const Slice& a, const Slice& b) const override {
+  using Comparator::CompareWithoutTimestamp;
+  int CompareWithoutTimestamp(const Slice& a, bool /*a_has_ts*/, const Slice& b,
+                              bool /*b_has_ts*/) const override {
     return -a.compare(b);
   }
 };