From 4c616412f938bc06a12e7526c4e314e4451c083c Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Mon, 17 Jul 2023 16:15:13 -0400
Subject: Added the parameter argument to query merge routine

This is necessary for KNN, but it unused for all currently implemented
query types.
---
 include/shard/MemISAM.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/shard/MemISAM.h')

diff --git a/include/shard/MemISAM.h b/include/shard/MemISAM.h
index b73d6fa..aa31962 100644
--- a/include/shard/MemISAM.h
+++ b/include/shard/MemISAM.h
@@ -486,7 +486,7 @@ public:
         return result;
     }
 
-    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++) {
-- 
cgit v1.2.3