diff --git a/table/merging_iterator.cc b/table/merging_iterator.cc index 615ad9aa9..da659cc6e 100644 --- a/table/merging_iterator.cc +++ b/table/merging_iterator.cc @@ -31,7 +31,7 @@ namespace ROCKSDB_NAMESPACE { #define FORCE_INLINE __forceinline #elif defined(__GNUC__) #define FORCE_INLINE __attribute__((always_inline)) -#pragma GCC diagnostic ignored "-Wattribute" +#pragma GCC diagnostic ignored "-Wattributes" #else #define inline #endif @@ -67,6 +67,7 @@ struct MaxInlineBytewiseComp { } MaxInlineBytewiseComp(const InternalKeyComparator*) {} }; + struct MinInlineBytewiseComp { FORCE_INLINE bool operator()(const IteratorWrapper* a,