Skip to content

build: Upstream envoy's C++20 patch #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions proxy_wasm_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -1712,9 +1712,9 @@ struct SimpleHistogram {
template <typename... Tags> struct Counter : public MetricBase {
static Counter<Tags...> *New(std::string_view name, MetricTagDescriptor<Tags>... fieldnames);

Counter<Tags...>(std::string_view name, MetricTagDescriptor<Tags>... descriptors)
: Counter<Tags...>(std::string(name), std::vector<MetricTag>({toMetricTag(descriptors)...})) {
}
template <typename... T>
Counter(std::string_view name, MetricTagDescriptor<T>... descriptors)
: Counter<T...>(std::string(name), std::vector<MetricTag>({toMetricTag(descriptors)...})) {}

SimpleCounter resolve(Tags... f) {
std::vector<std::string> fields{toString(f)...};
Expand Down Expand Up @@ -1763,8 +1763,9 @@ inline Counter<Tags...> *Counter<Tags...>::New(std::string_view name,
template <typename... Tags> struct Gauge : public MetricBase {
static Gauge<Tags...> *New(std::string_view name, MetricTagDescriptor<Tags>... fieldnames);

Gauge<Tags...>(std::string_view name, MetricTagDescriptor<Tags>... descriptors)
: Gauge<Tags...>(std::string(name), std::vector<MetricTag>({toMetricTag(descriptors)...})) {}
template <typename... T>
Gauge(std::string_view name, MetricTagDescriptor<T>... descriptors)
: Gauge<T...>(std::string(name), std::vector<MetricTag>({toMetricTag(descriptors)...})) {}

SimpleGauge resolve(Tags... f) {
std::vector<std::string> fields{toString(f)...};
Expand Down Expand Up @@ -1809,9 +1810,9 @@ inline Gauge<Tags...> *Gauge<Tags...>::New(std::string_view name,
template <typename... Tags> struct Histogram : public MetricBase {
static Histogram<Tags...> *New(std::string_view name, MetricTagDescriptor<Tags>... fieldnames);

Histogram<Tags...>(std::string_view name, MetricTagDescriptor<Tags>... descriptors)
: Histogram<Tags...>(std::string(name),
std::vector<MetricTag>({toMetricTag(descriptors)...})) {}
template <typename... T>
Histogram(std::string_view name, MetricTagDescriptor<T>... descriptors)
: Histogram<T...>(std::string(name), std::vector<MetricTag>({toMetricTag(descriptors)...})) {}

SimpleHistogram resolve(Tags... f) {
std::vector<std::string> fields{toString(f)...};
Expand Down
Loading