misc: Size report binary fixes
This fixes compiler errors that occur within various size reports.
Change-Id: Icdfd439ace38e5183c46a92fc73c39b24ea8638e
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/17628
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Alexei Frolov <frolv@google.com>
diff --git a/pw_bytes/size_report/byte_builder_size_report.cc b/pw_bytes/size_report/byte_builder_size_report.cc
index 72a440d..834fe63 100644
--- a/pw_bytes/size_report/byte_builder_size_report.cc
+++ b/pw_bytes/size_report/byte_builder_size_report.cc
@@ -38,8 +38,8 @@
void ReadBytes() {
auto it = bb.begin();
- printf("%lu\n", it.ReadUint32());
- printf("%ld\n", it.ReadInt32(pw::ByteOrder::kBigEndian));
+ printf("%u\n", static_cast<unsigned>(it.ReadUint32()));
+ printf("%d\n", static_cast<int>(it.ReadInt32(pw::ByteOrder::kBigEndian)));
}
#else // !USE_BYTE_BUILDER
@@ -90,8 +90,8 @@
((kVal1 & 0xFF000000) >> 3 * 8));
}
- printf("%lu\n", kVal1);
- printf("%ld\n", kVal2);
+ printf("%u\n", static_cast<unsigned>(kVal1));
+ printf("%d\n", static_cast<int>(kVal2));
}
#endif // USE_BYTE_BUILDER
diff --git a/pw_metric/size_report/base.cc b/pw_metric/size_report/base.cc
index 8fb1abc..967201c 100644
--- a/pw_metric/size_report/base.cc
+++ b/pw_metric/size_report/base.cc
@@ -22,7 +22,7 @@
pw::bloat::BloatThisBinary();
// Ensure we are paying the cost for log and assert.
- PW_CHECK_INT_GE(unoptimizable, 0, "Ensure this CHECK logic stays");
+ PW_CHECK_INT_GE(*unoptimizable, 0, "Ensure this CHECK logic stays");
PW_LOG_INFO("We care about optimizing: %d", *unoptimizable);
// This matches the log preventing optimizing the "m" metric in one_metric.cc.
PW_LOG_INFO("some_metric: %d", *unoptimizable);
diff --git a/pw_metric/size_report/dump.cc b/pw_metric/size_report/dump.cc
index b7ec068..12a83fb 100644
--- a/pw_metric/size_report/dump.cc
+++ b/pw_metric/size_report/dump.cc
@@ -31,7 +31,7 @@
metric_x.Increment();
// Ensure log and assert aren't optimized out.
- PW_CHECK_INT_GE(unoptimizable, 0, "Ensure this CHECK logic stays");
+ PW_CHECK_INT_GE(*unoptimizable, 0, "Ensure this CHECK logic stays");
PW_LOG_INFO("Ensure logs are pulled in: %d", *unoptimizable);
// Ensure metric_x isn't optimized out.
diff --git a/pw_metric/size_report/more_metrics.cc b/pw_metric/size_report/more_metrics.cc
index 883a8ca..2ceb7f0 100644
--- a/pw_metric/size_report/more_metrics.cc
+++ b/pw_metric/size_report/more_metrics.cc
@@ -51,7 +51,7 @@
metric_y.Increment();
// Ensure log and assert aren't optimized out.
- PW_CHECK_INT_GE(unoptimizable, 0, "Ensure this CHECK logic stays");
+ PW_CHECK_INT_GE(*unoptimizable, 0, "Ensure this CHECK logic stays");
PW_LOG_INFO("Ensure logs are pulled in: %d", *unoptimizable);
// Ensure metric_x isn't optimized out.
diff --git a/pw_metric/size_report/one_metric.cc b/pw_metric/size_report/one_metric.cc
index 4f08d07..2869267 100644
--- a/pw_metric/size_report/one_metric.cc
+++ b/pw_metric/size_report/one_metric.cc
@@ -32,7 +32,7 @@
metric_x.Increment();
// Ensure log and assert aren't optimized out.
- PW_CHECK_INT_GE(unoptimizable, 0, "Ensure this CHECK logic stays");
+ PW_CHECK_INT_GE(*unoptimizable, 0, "Ensure this CHECK logic stays");
PW_LOG_INFO("Ensure logs are pulled in: %d", *unoptimizable);
// Ensure metric_x isn't optimized out.
