summaryrefslogtreecommitdiffstats
path: root/benchmarks/include/triespline_bsm.h
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/include/triespline_bsm.h')
-rw-r--r--benchmarks/include/triespline_bsm.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/benchmarks/include/triespline_bsm.h b/benchmarks/include/triespline_bsm.h
index 4276074..dfddc43 100644
--- a/benchmarks/include/triespline_bsm.h
+++ b/benchmarks/include/triespline_bsm.h
@@ -2,6 +2,7 @@
#include <cstdlib>
#include <vector>
+#include <algorithm>
#include "ts/builder.h"
template <typename K, typename V, size_t E=1024>
@@ -52,7 +53,7 @@ public:
return std::move(rs);
}
- std::vector<R> query_merge(std::vector<R> &rsa, std::vector<R> &rsb) {
+ std::vector<R> query_merge(std::vector<R> &rsa, std::vector<R> &rsb, void *parms) {
rsa[0].first += rsb[0].first;
return std::move(rsa);
}