generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 4602d8c7: am 04bbef37: Merge "Fix 64-bit benchmark build"

Browse Source 
* commit '4602d8c7621ffd87e32f53c8f7e8ac5453a404ca':
  Fix 64-bit benchmark build
This commit is contained in:
Greg Hackmann
2015-02-20 19:27:13 +00:00
committed by Android Git Automerger
parent 5bf236e95f 4602d8c762
commit 973ceef686
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/Benchmark.cpp
View File

@@ -44,8 +44,8 @@ std::vector<Benchmark*>& Benchmark::List() {
return list; return list;
} }
size_t Benchmark::MaxNameColumnWidth() { int Benchmark::MaxNameColumnWidth() {
size_t max = 20; int max = 20;
for (auto& benchmark : List()) { for (auto& benchmark : List()) {
max = std::max(max, benchmark->NameColumnWidth()); max = std::max(max, benchmark->NameColumnWidth());
} }

14
benchmarks/benchmark/Benchmark.h
View File

@@ -47,10 +47,10 @@ public:
static std::vector<Benchmark*>& List(); static std::vector<Benchmark*>& List();
static size_t MaxNameColumnWidth(); static int MaxNameColumnWidth();
protected: protected:
virtual size_t NameColumnWidth() = 0; virtual int NameColumnWidth() = 0;
uint64_t bytes_processed_; uint64_t bytes_processed_;
uint64_t total_time_ns_; uint64_t total_time_ns_;
@@ -85,8 +85,8 @@ protected:
virtual void Run(int) = 0; virtual void Run(int) = 0;
virtual size_t NameColumnWidth() override { virtual int NameColumnWidth() override {
return Name().size(); return (int)Name().size();
} }
virtual std::string GetNameStr(void *) override; virtual std::string GetNameStr(void *) override;
@@ -104,10 +104,10 @@ public:
} }
protected: protected:
virtual size_t NameColumnWidth() override { virtual int NameColumnWidth() override {
size_t max = 0; int max = 0;
for (const auto arg : args_) { for (const auto arg : args_) {
max = std::max(max, GetNameStr(arg).size()); max = std::max(max, (int)GetNameStr(arg).size());
} }
return max; return max;
} }