mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-29 11:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'cql3, locator: call fmt::format_to() explicitly and include used headers' from Kefu Chai

Browse Source 
these fixes address the FTBFS of scylla with GCC-13.

Closes #12669

* github.com:scylladb/scylladb:
  cql3/stats: include the used header.
  cql3, locator: call fmt::format_to() explicitly
This commit is contained in:
Botond Dénes
2023-01-31 08:49:26 +02:00
committed by Pavel Emelyanov
parent d065f9f82e 58b4dc5b9a
commit d8073edbb7
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cql3/expr/expression.hh
View File

@@ -821,10 +821,10 @@ struct fmt::formatter<cql3::expr::expression> {
}
template <typename FormatContext>
auto format(const cql3::expr::expression& expr, FormatContext& ctx) {
auto format(const cql3::expr::expression& expr, FormatContext& ctx) const {
std::ostringstream os;
os << expr;
return format_to(ctx.out(), "{}", os.str());
return fmt::format_to(ctx.out(), "{}", os.str());
}
};
@@ -836,10 +836,10 @@ struct fmt::formatter<cql3::expr::expression::printer> {
}
template <typename FormatContext>
auto format(const cql3::expr::expression::printer& pr, FormatContext& ctx) {
auto format(const cql3::expr::expression::printer& pr, FormatContext& ctx) const {
std::ostringstream os;
os << pr;
return format_to(ctx.out(), "{}", os.str());
return fmt::format_to(ctx.out(), "{}", os.str());
}
};
@@ -854,6 +854,6 @@ struct fmt::formatter<cql3::expr::column_value> {
auto format(const cql3::expr::column_value& col, FormatContext& ctx) {
std::ostringstream os;
os << col;
return format_to(ctx.out(), "{}", os.str());
return fmt::format_to(ctx.out(), "{}", os.str());
}
};

2
cql3/stats.hh
View File

@@ -12,6 +12,8 @@
#include "cql3/statements/statement_type.hh"
#include <cstdint>
namespace cql3 {
/** Enums for selecting counters in `cql_stats', like:

2
locator/abstract_replication_strategy.hh
View File

@@ -308,7 +308,7 @@ struct fmt::formatter<locator::effective_replication_map::factory_key> {
auto format(const locator::effective_replication_map::factory_key& key, FormatContext& ctx) {
std::ostringstream os;
os << key;
return format_to(ctx.out(), "{}", os.str());
return fmt::format_to(ctx.out(), "{}", os.str());
}
};