aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-05-12 11:29:08 -0700
committerGravatar GitHub <noreply@github.com>2017-05-12 11:29:08 -0700
commita1ae21dd2ea19103eaf34b4c31e3e7fab9c3b866 (patch)
tree5cd25a29cab751492cdc0a4c08e09dbd95a4474f /test/cpp
parent5854ac4af2a06a846701068675b20cc5568aade6 (diff)
parent3f92508dacca36fe334946fc0b30bac88be8e18f (diff)
Merge pull request #11102 from ctiller/clang5
clang5 fixes
Diffstat (limited to 'test/cpp')
-rw-r--r--test/cpp/microbenchmarks/helpers.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/microbenchmarks/helpers.cc b/test/cpp/microbenchmarks/helpers.cc
index 6550742453..73ab9e4a1a 100644
--- a/test/cpp/microbenchmarks/helpers.cc
+++ b/test/cpp/microbenchmarks/helpers.cc
@@ -36,11 +36,11 @@
void TrackCounters::Finish(benchmark::State &state) {
std::ostringstream out;
AddToLabel(out, state);
- auto label = out.str();
+ std::string label = out.str();
if (label.length() && label[0] == ' ') {
label = label.substr(1);
}
- state.SetLabel(label);
+ state.SetLabel(label.c_str());
}
void TrackCounters::AddToLabel(std::ostream &out, benchmark::State &state) {