Skip to content
Merged
2 changes: 1 addition & 1 deletion src/common/status.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ struct StringInStatusOr<T, std::enable_if_t<sizeof(T) < sizeof(std::string)>> :
StringInStatusOr(StringInStatusOr<U>&& v) : BaseType(new std::string(*std::move(v))) {} // NOLINT
template <typename U, typename std::enable_if_t<!StringInStatusOr<U>::inplace, int> = 0>
StringInStatusOr(StringInStatusOr<U>&& v) // NOLINT
: BaseType((typename StringInStatusOr<U>::BaseType &&)(std::move(v))) {}
: BaseType((typename StringInStatusOr<U>::BaseType&&)(std::move(v))) {}

StringInStatusOr(const StringInStatusOr& v) = delete;

Expand Down
2 changes: 1 addition & 1 deletion tests/cppunit/types/bitmap_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ TEST_P(RedisBitmapTest, BitPosStopGiven) {
}
bitmap_->BitPos(key_, false, 0, 0, /*stop_given=*/true, &pos, /*bit_index=*/false);
EXPECT_EQ(-1, pos);
bitmap_->BitPos(key_, false, 0, 1, /*stop_given=*/false, &pos, /*bit_index=*/ false);
bitmap_->BitPos(key_, false, 0, 1, /*stop_given=*/false, &pos, /*bit_index=*/false);
EXPECT_EQ(9, pos);

auto s = bitmap_->Del(key_);
Expand Down