commit 5ab51d0d1af455afb22621dc3b75079d2b274929
author Elliott Hughes <enh@google.com> Thu Jun 12 12:52:58 2014 -0700
committer Elliott Hughes <enh@google.com> Thu Jun 12 12:52:58 2014 -0700
tree 419648e8a9d55415bd9ac4ec769c7bc7876d2346
parent d242aff47dc4eaa5081dc7af821308d353cd1090

Fix GCC 4.9 complaint about int/size_t mismatch.

Change-Id: Ib13857f98658dc8760cff15adb5829e8e140008a

benchmarks/benchmark_main.cpp

diff --git a/benchmarks/benchmark_main.cpp b/benchmarks/benchmark_main.cpp
index cd80968..d60670b 100644
--- a/benchmarks/benchmark_main.cpp
+++ b/benchmarks/benchmark_main.cpp
@@ -32,7 +32,7 @@
 typedef std::map<std::string, ::testing::Benchmark*> BenchmarkMap;
 typedef BenchmarkMap::iterator BenchmarkMapIt;
 static BenchmarkMap g_benchmarks;
-static size_t g_name_column_width = 20;
+static int g_name_column_width = 20;
 
 static int Round(int n) {
   int base = 1;
@@ -196,7 +196,8 @@
   }
 
   for (BenchmarkMapIt it = g_benchmarks.begin(); it != g_benchmarks.end(); ++it) {
-    g_name_column_width = std::max(g_name_column_width, strlen(it->second->Name()));
+    int name_width = static_cast<int>(strlen(it->second->Name()));
+    g_name_column_width = std::max(g_name_column_width, name_width);
   }
 
   bool need_header = true;