summaryrefslogtreecommitdiffstats
path: root/include/shard/TrieSpline.h
diff options
context:
space:
mode:
authorDouglas Rumbaugh <dbr4@psu.edu>2023-07-17 16:15:13 -0400
committerDouglas Rumbaugh <dbr4@psu.edu>2023-07-17 16:15:13 -0400
commit4c616412f938bc06a12e7526c4e314e4451c083c (patch)
treed67b3130691e43dc1f5842d13378906e70f8358c /include/shard/TrieSpline.h
parent7bed50185d3e114381043b8fdbe5c748a5c9a490 (diff)
downloaddynamic-extension-4c616412f938bc06a12e7526c4e314e4451c083c.tar.gz
Added the parameter argument to query merge routine
This is necessary for KNN, but it unused for all currently implemented query types.
Diffstat (limited to 'include/shard/TrieSpline.h')
-rw-r--r--include/shard/TrieSpline.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/shard/TrieSpline.h b/include/shard/TrieSpline.h
index 0cb0180..b068313 100644
--- a/include/shard/TrieSpline.h
+++ b/include/shard/TrieSpline.h
@@ -355,7 +355,7 @@ public:
return records;
}
- static std::vector<R> merge(std::vector<std::vector<R>> &results) {
+ static std::vector<R> merge(std::vector<std::vector<R>> &results, void *parms) {
std::vector<R> output;
for (size_t i=0; i<results.size(); i++) {