aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-07-05 19:59:32 -1100
committerMarcoFalke <falke.marco@gmail.com>2018-07-05 19:59:35 -1100
commit0212187fc624ea4a02fc99bc57ebd413499a9ee1 (patch)
tree96a699d1140606a23b0cbbfad8aba626e614b4de /src
parent287e4edc2fd2514a0095273f01fe66b85ce10856 (diff)
parent1fc605a8aea247b2d5776c22b3e187d1b190fd99 (diff)
Merge #13598: bench: fix incorrect behaviour in prevector.cpp
1fc605a8ae fix bench/prevector.cpp (Akio Nakamura) Pull request description: This patch intends to fix some incorrect action of bench/prevector.cpp. 1. PrevectorClear() 2nd call of ```clear()``` should to operate t1 instead of t0. This patch changes t0 to t1. 2. PREVECTOR_TEST() PREVECTOR_TEST macro should to call both ```PrevectorXX<nontrivial_t>(state)``` and ```PrevectorXX<trivial_t>(state)``` by specific ```"name"``` which given by parameter instead of calling ```PrevectorResize<>()``` regardless of ```"name"```. This patch changes ```"PrevectorResize<"``` of this macro to ```"Prevector ## name<"```. Tree-SHA512: d0498c6d627d7e96fc8ccfb329ca0be2641535b1ce1923d9b1fc720825f9bf4d7281dc8d5ae929038e37b3e625189af9807cb62e6d20933d73832a6dff4b5596
Diffstat (limited to 'src')
-rw-r--r--src/bench/prevector.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp
index 3cfad1b2c4..09c7020848 100644
--- a/src/bench/prevector.cpp
+++ b/src/bench/prevector.cpp
@@ -42,7 +42,7 @@ static void PrevectorClear(benchmark::State& state)
t0.resize(28);
t0.clear();
t1.resize(29);
- t0.clear();
+ t1.clear();
}
}
}
@@ -64,11 +64,11 @@ static void PrevectorResize(benchmark::State& state)
#define PREVECTOR_TEST(name, nontrivops, trivops) \
static void Prevector ## name ## Nontrivial(benchmark::State& state) { \
- PrevectorResize<nontrivial_t>(state); \
+ Prevector ## name<nontrivial_t>(state); \
} \
BENCHMARK(Prevector ## name ## Nontrivial, nontrivops); \
static void Prevector ## name ## Trivial(benchmark::State& state) { \
- PrevectorResize<trivial_t>(state); \
+ Prevector ## name<trivial_t>(state); \
} \
BENCHMARK(Prevector ## name ## Trivial, trivops);