fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 03:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings from Travis

Browse Source
This commit is contained in:
Elias Kosunen
2019-02-02 20:24:07 -05:00
committed by Victor Zverovich
parent 355eb6d29a
commit 22de5a755f
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/fmt/prepare.h
View File

@ -383,7 +383,6 @@ template <typename Format> class compiletime_prepared_parts_type_provider {
private: private:
FMT_CONSTEXPR const char_type* find_matching_brace(const char_type* begin, FMT_CONSTEXPR const char_type* find_matching_brace(const char_type* begin,
const char_type* end) { const char_type* end) {
FMT_CONSTEXPR_DECL const basic_string_view<char_type> text = Format{};
unsigned braces_counter{0u}; unsigned braces_counter{0u};
for (; begin != end; ++begin) { for (; begin != end; ++begin) {
if (*begin == '{') { if (*begin == '{') {

2
test/ostream-test.cc
View File

@ -154,7 +154,7 @@ TEST(OStreamTest, WriteToOStreamMaxSize) {
EXPECT_CALL(streambuf, xsputn(data, static_cast<std::streamsize>(n))) EXPECT_CALL(streambuf, xsputn(data, static_cast<std::streamsize>(n)))
.WillOnce(testing::Return(max_streamsize)); .WillOnce(testing::Return(max_streamsize));
data += n; data += n;
size -= static_cast<std::size_t>(n); size -= n;
} while (size != 0); } while (size != 0);
fmt::internal::write(os, buffer); fmt::internal::write(os, buffer);
} }

10
test/prepare-test.cc
View File

@ -169,7 +169,6 @@ TEST(PrepareTest, FormatPart_ComparisonOperators) {
auto rhs = format_part(specs); auto rhs = format_part(specs);
EXPECT_EQ(lhs, rhs); EXPECT_EQ(lhs, rhs);
const auto specs_text = fmt::string_view("<10");
specs.parsed_specs = prepared_specs(); specs.parsed_specs = prepared_specs();
lhs = format_part(specs); lhs = format_part(specs);
rhs = format_part(specs); rhs = format_part(specs);
@ -191,8 +190,6 @@ TEST(PrepareTest, FormatPart_ComparisonOperators) {
rhs = format_part(rhs_spec); rhs = format_part(rhs_spec);
EXPECT_NE(lhs, rhs); EXPECT_NE(lhs, rhs);
const auto lhs_specs_text = fmt::string_view("<10");
const auto rhs_specs_text = fmt::string_view("<42");
lhs_spec = format_part::specification(specs_argument_id); lhs_spec = format_part::specification(specs_argument_id);
rhs_spec = format_part::specification(specs_argument_id); rhs_spec = format_part::specification(specs_argument_id);
lhs_spec.parsed_specs.precision = 1; lhs_spec.parsed_specs.precision = 1;
@ -202,7 +199,6 @@ TEST(PrepareTest, FormatPart_ComparisonOperators) {
EXPECT_NE(lhs, rhs); EXPECT_NE(lhs, rhs);
} }
{ {
const auto specs_text = fmt::string_view{"<10"};
const auto specs_argument_id = 0u; const auto specs_argument_id = 0u;
const auto specs_named_argument_id = const auto specs_named_argument_id =
fmt::internal::string_view_metadata(0, 42); fmt::internal::string_view_metadata(0, 42);
@ -623,7 +619,7 @@ template <typename T> struct user_allocator {
template <typename U> user_allocator(const user_allocator<U>&) {} template <typename U> user_allocator(const user_allocator<U>&) {}
pointer allocate(size_type cnt, pointer allocate(size_type cnt,
typename std::allocator<void>::const_pointer = 0) { typename std::allocator<void>::const_pointer = FMT_NULL) {
return new value_type[cnt]; return new value_type[cnt];
} }
@ -633,8 +629,8 @@ template <typename T> struct user_allocator {
void destroy(pointer p) { (*p).~value_type(); } void destroy(pointer p) { (*p).~value_type(); }
bool operator==(const user_allocator& other) const { return true; } bool operator==(const user_allocator&) const { return true; }
bool operator!=(const user_allocator& other) const { return false; } bool operator!=(const user_allocator&) const { return false; }
}; };
TEST(PrepareTest, PassUserTypeFormat) { TEST(PrepareTest, PassUserTypeFormat) {