Skip to content

Commit b1f54d4

Browse files
committed
Small pipeline fixes
1 parent 71855a9 commit b1f54d4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

exporters/otlp/src/otlp_metric_utils.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <stdint.h>
55
#include <map>
6+
#include <memory>
67
#include <utility>
78
#include <vector>
89

sdk/src/metrics/aggregation/base2_exponential_histogram_aggregation.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <stddef.h>
55
#include <stdint.h>
66
#include <algorithm>
7-
#include <iostream>
87
#include <limits>
98
#include <memory>
109
#include <mutex>
@@ -419,7 +418,7 @@ std::unique_ptr<Aggregation> Base2ExponentialHistogramAggregation::Diff(
419418
{
420419
auto l_cnt = left.positive_buckets_->Get(i);
421420
auto r_cnt = right.positive_buckets_->Get(i);
422-
auto delta = std::max(static_cast<uint64_t>(0), r_cnt - l_cnt);
421+
auto delta = (std::max)(static_cast<uint64_t>(0), r_cnt - l_cnt);
423422
if (delta > 0)
424423
{
425424
result_value.positive_buckets_->Increment(i, delta);
@@ -433,7 +432,7 @@ std::unique_ptr<Aggregation> Base2ExponentialHistogramAggregation::Diff(
433432
{
434433
auto l_cnt = left.negative_buckets_->Get(i);
435434
auto r_cnt = right.negative_buckets_->Get(i);
436-
auto delta = std::max(static_cast<uint64_t>(0), r_cnt - l_cnt);
435+
auto delta = (std::max)(static_cast<uint64_t>(0), r_cnt - l_cnt);
437436
if (delta > 0)
438437
{
439438
result_value.negative_buckets_->Increment(i, delta);

0 commit comments

Comments
 (0)