From 622c26389ffa6fd2dfb580289cce63f3e48a658c Mon Sep 17 00:00:00 2001
From: Sebastian Pop <sebpop@gmail.com>
Date: Fri, 14 Oct 2016 00:07:57 +0000
Subject: [PATCH] remove warnings from google-benchmarks in libcxx

Differential Revision: https://reviews.llvm.org/D25522

Patch written by Aditya Kumar.

llvm-svn: 284179
---
 libcxx/benchmarks/ContainerBenchmarks.hpp | 3 ++-
 libcxx/benchmarks/GenerateInput.hpp       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libcxx/benchmarks/ContainerBenchmarks.hpp b/libcxx/benchmarks/ContainerBenchmarks.hpp
index 973a135..dc268e7 100644
--- a/libcxx/benchmarks/ContainerBenchmarks.hpp
+++ b/libcxx/benchmarks/ContainerBenchmarks.hpp
@@ -11,10 +11,11 @@ namespace ContainerBenchmarks {
 template <class Container, class GenInputs>
 void BM_ConstructIterIter(benchmark::State& st, Container, GenInputs gen) {
     auto in = gen(st.range(0));
+    const auto begin = in.begin();
     const auto end = in.end();
     benchmark::DoNotOptimize(&in);
     while (st.KeepRunning()) {
-        Container c(in.begin(), in.end());
+        Container c(begin, end);
         benchmark::DoNotOptimize(c.data());
     }
 }
diff --git a/libcxx/benchmarks/GenerateInput.hpp b/libcxx/benchmarks/GenerateInput.hpp
index 49fb48d..affd541 100644
--- a/libcxx/benchmarks/GenerateInput.hpp
+++ b/libcxx/benchmarks/GenerateInput.hpp
@@ -112,7 +112,7 @@ inline std::vector<std::string> getDuplicateStringInputs(size_t N) {
 
 inline std::vector<std::string> getRandomStringInputs(size_t N) {
     std::vector<std::string> inputs;
-    for (int i=0; i < N; ++i) {
+    for (size_t i=0; i < N; ++i) {
         inputs.push_back(getRandomString(1024));
     }
     return inputs;
-- 
2.7.4