import 15.2.0 Octopus source

[ceph.git] / ceph / src / test / common / test_interval_map.cc

diff --git a/ceph/src/test/common/test_interval_map.cc b/ceph/src/test/common/test_interval_map.cc
index 4a1c258bb7dbb832bb47a95095cc45b319420d92..99f676f288b696ca0fec61414bb9cf6a303fb450 100644 (file)
--- a/ceph/src/test/common/test_interval_map.cc
+++ b/ceph/src/test/common/test_interval_map.cc
@@ -49,7 +49,7 @@ struct bufferlist_test_type {
       bufferlist merge(bufferlist &&left, bufferlist &&right) const {
        bufferlist bl;
        left.claim_append(right);
-       return left;
+       return std::move(left);
       }
       uint64_t length(const bufferlist &r) const {
        return r.length();
@@ -72,7 +72,7 @@ struct bufferlist_test_type {
 
 using IntervalMapTypes = ::testing::Types< bufferlist_test_type<uint64_t> >;
 
-TYPED_TEST_CASE(IntervalMapTest, IntervalMapTypes);
+TYPED_TEST_SUITE(IntervalMapTest, IntervalMapTypes);
 
 #define USING(_can_merge)                                       \
   using TT = typename TestFixture::TestType;                     \