🎨 🐛 Rename all shadowed types and variables

This commit is contained in:
Jonathan Gopel
2020-10-27 21:55:44 -06:00
committed by Victor Zverovich
parent 771292c328
commit e904e891bd
7 changed files with 41 additions and 42 deletions

View File

@@ -83,8 +83,8 @@ template <typename T> struct mock_buffer final : buffer<T> {
void grow(size_t capacity) { this->set(this->data(), do_grow(capacity)); }
mock_buffer(T* data = nullptr, size_t capacity = 0) {
this->set(data, capacity);
mock_buffer(T* data = nullptr, size_t buf_capacity = 0) {
this->set(data, buf_capacity);
ON_CALL(*this, do_grow(_)).WillByDefault(Invoke([](size_t capacity) {
return capacity;
}));
@@ -224,9 +224,9 @@ struct custom_context {
};
bool called;
fmt::format_parse_context ctx;
fmt::format_parse_context parse_ctx;
fmt::format_parse_context& parse_context() { return ctx; }
fmt::format_parse_context& parse_context() { return parse_ctx; }
void advance_to(const char*) {}
};
@@ -688,9 +688,9 @@ TYPED_TEST(IsStringTest, IsString) {
EXPECT_TRUE(fmt::detail::is_string<fmt::basic_string_view<TypeParam>>::value);
EXPECT_TRUE(
fmt::detail::is_string<derived_from_string_view<TypeParam>>::value);
using string_view = fmt::detail::std_string_view<TypeParam>;
EXPECT_TRUE(std::is_empty<string_view>::value !=
fmt::detail::is_string<string_view>::value);
using fmt_string_view = fmt::detail::std_string_view<TypeParam>;
EXPECT_TRUE(std::is_empty<fmt_string_view>::value !=
fmt::detail::is_string<fmt_string_view>::value);
EXPECT_TRUE(fmt::detail::is_string<my_ns::my_string<TypeParam>>::value);
EXPECT_FALSE(fmt::detail::is_string<my_ns::non_string>::value);
}