aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks/Benchmark.cpp
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2015-02-20 11:00:14 -0800
committerGreg Hackmann <ghackmann@google.com>2015-02-20 11:07:38 -0800
commit567bfb3779f238784be6d3fa9d384ecdc423ea39 (patch)
tree690caf6a783541e6877461c908bccddae5f0abdb /benchmarks/Benchmark.cpp
parentc39eef71a7f66b69e2216a51d0e7fbc1796d0696 (diff)
downloadandroid_bionic-567bfb3779f238784be6d3fa9d384ecdc423ea39.tar.gz
android_bionic-567bfb3779f238784be6d3fa9d384ecdc423ea39.tar.bz2
android_bionic-567bfb3779f238784be6d3fa9d384ecdc423ea39.zip
Fix 64-bit benchmark build
The * flag to printf() wants an int instead of size_t, and these are distinct types on 64-bit. To accomodate this, make the name column width helpers return int. In theory this truncates things, but in practice this only matters if you have a benchmark with more than INT_MAX characters in its name (in which case you have bigger problems). Change-Id: I3338948c25a3a8d84f1ead2f5b457c05da8a01cf Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'benchmarks/Benchmark.cpp')
-rw-r--r--benchmarks/Benchmark.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/benchmarks/Benchmark.cpp b/benchmarks/Benchmark.cpp
index 0eb779a5d..eea304f5b 100644
--- a/benchmarks/Benchmark.cpp
+++ b/benchmarks/Benchmark.cpp
@@ -44,8 +44,8 @@ std::vector<Benchmark*>& Benchmark::List() {
return list;
}
-size_t Benchmark::MaxNameColumnWidth() {
- size_t max = 20;
+int Benchmark::MaxNameColumnWidth() {
+ int max = 20;
for (auto& benchmark : List()) {
max = std::max(max, benchmark->NameColumnWidth());
}