diff --git a/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h b/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h index 43e7285b23..4436b532d3 100644 --- a/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h +++ b/api/include/opentelemetry/nostd/internal/absl/types/internal/variant.h @@ -45,7 +45,7 @@ OTABSL_NAMESPACE_BEGIN template class variant; -OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, -1); +OTABSL_INTERNAL_INLINE_CONSTEXPR(size_t, variant_npos, static_cast(-1)); template struct variant_size; diff --git a/api/include/opentelemetry/nostd/string_view.h b/api/include/opentelemetry/nostd/string_view.h index f0e5bd9e2a..a0c8081473 100644 --- a/api/include/opentelemetry/nostd/string_view.h +++ b/api/include/opentelemetry/nostd/string_view.h @@ -124,7 +124,7 @@ class string_view auto found = Traits::find(data() + pos, length() - pos, ch); if (found) { - res = found - data(); + res = static_cast(found - data()); } } return res; diff --git a/api/include/opentelemetry/trace/span_id.h b/api/include/opentelemetry/trace/span_id.h index 19511040df..6537f77fc7 100644 --- a/api/include/opentelemetry/trace/span_id.h +++ b/api/include/opentelemetry/trace/span_id.h @@ -17,7 +17,7 @@ class SpanId final { public: // The size in bytes of the SpanId. - static constexpr int kSize = 8; + static constexpr size_t kSize = 8; // An invalid SpanId (all zeros). SpanId() noexcept : rep_{0} {} @@ -29,7 +29,7 @@ class SpanId final void ToLowerBase16(nostd::span buffer) const noexcept { constexpr char kHex[] = "0123456789abcdef"; - for (int i = 0; i < kSize; ++i) + for (size_t i = 0; i < kSize; ++i) { buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF]; buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF]; diff --git a/api/include/opentelemetry/trace/trace_id.h b/api/include/opentelemetry/trace/trace_id.h index 3a262c7a6a..533037123e 100644 --- a/api/include/opentelemetry/trace/trace_id.h +++ b/api/include/opentelemetry/trace/trace_id.h @@ -20,7 +20,7 @@ class TraceId final { public: // The size in bytes of the TraceId. - static constexpr int kSize = 16; + static constexpr size_t kSize = 16; // An invalid TraceId (all zeros). TraceId() noexcept : rep_{0} {} @@ -35,7 +35,7 @@ class TraceId final void ToLowerBase16(nostd::span buffer) const noexcept { constexpr char kHex[] = "0123456789abcdef"; - for (int i = 0; i < kSize; ++i) + for (size_t i = 0; i < kSize; ++i) { buffer[i * 2 + 0] = kHex[(rep_[i] >> 4) & 0xF]; buffer[i * 2 + 1] = kHex[(rep_[i] >> 0) & 0xF];