From 6aa2937543895fbe536c70b9cc3af88566172d07 Mon Sep 17 00:00:00 2001 From: paulfd Date: Sat, 21 Sep 2019 10:48:28 +0200 Subject: [PATCH] Final updates for c++14' --- benchmarks/BM_ADSR.cpp | 4 ++-- external/abseil-cpp | 2 +- external/benchmark | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/benchmarks/BM_ADSR.cpp b/benchmarks/BM_ADSR.cpp index b54dd720..0125507f 100644 --- a/benchmarks/BM_ADSR.cpp +++ b/benchmarks/BM_ADSR.cpp @@ -49,7 +49,7 @@ static void Point(benchmark::State& state) { out = envelope.getNextValue(); benchmark::DoNotOptimize(output); } - state.counters["Per block"] = benchmark::Counter(envelopeSize / state.range(0), benchmark::Counter::kIsIterationInvariantRate | benchmark::Counter::kInvert); + state.counters["Per block"] = benchmark::Counter(envelopeSize / state.range(0), benchmark::Counter::kIsIterationInvariantRate); } static void Block(benchmark::State& state) { @@ -63,7 +63,7 @@ static void Block(benchmark::State& state) { benchmark::DoNotOptimize(output); } - state.counters["Per block"] = benchmark::Counter(envelopeSize / state.range(0), benchmark::Counter::kIsIterationInvariantRate | benchmark::Counter::kInvert); + state.counters["Per block"] = benchmark::Counter(envelopeSize / state.range(0), benchmark::Counter::kIsIterationInvariantRate); } BENCHMARK(Point)->RangeMultiplier(2)->Range((2<<6), (2<<11)); diff --git a/external/abseil-cpp b/external/abseil-cpp index aa844899..ac78ffc3 160000 --- a/external/abseil-cpp +++ b/external/abseil-cpp @@ -1 +1 @@ -Subproject commit aa844899c937bde5d2b24f276b59997e5b668bde +Subproject commit ac78ffc3bc0a8b295cab9a03817760fd460df2a1 diff --git a/external/benchmark b/external/benchmark index 090faecb..bf4f2ea0 160000 --- a/external/benchmark +++ b/external/benchmark @@ -1 +1 @@ -Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4 +Subproject commit bf4f2ea0bd1180b34718ac26eb79b170a4f6290e