Added the parameter argument to query merge routine

This is necessary for KNN, but it unused for all currently implemented
query types.

4 files changed, 4 insertions, 4 deletions

diff --git a/tests/memisam_tests.cpp b/tests/memisam_tests.cpp
index ef0bd8e..7f6d136 100644
--- a/tests/memisam_tests.cpp
+++ b/tests/memisam_tests.cpp
@@ -238,7 +238,7 @@ START_TEST(t_irs_query_merge)
         IRSQuery<Rec>::delete_query_state(state2);
     }
 
-    auto merged = IRSQuery<Rec>::merge(results);
+    auto merged = IRSQuery<Rec>::merge(results, nullptr);
 
     ck_assert_int_eq(merged.size(), 2*k);
     for (size_t i=0; i<merged.size(); i++) {
diff --git a/tests/pgm_tests.cpp b/tests/pgm_tests.cpp
index 083b370..9622522 100644
--- a/tests/pgm_tests.cpp
+++ b/tests/pgm_tests.cpp
@@ -221,7 +221,7 @@ START_TEST(t_range_query_merge)
         }
     }
 
-    auto result = PGMRangeQuery<Rec>::merge(proc_results);
+    auto result = PGMRangeQuery<Rec>::merge(proc_results, nullptr);
     std::sort(result.begin(), result.end());
 
     ck_assert_int_eq(result.size(), result_size);
diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp
index ddf9764..2fe7f68 100644
--- a/tests/wirs_tests.cpp
+++ b/tests/wirs_tests.cpp
@@ -244,7 +244,7 @@ START_TEST(t_wirs_query_merge)
         WIRSQuery<WRec>::delete_query_state(state2);
     }
 
-    auto merged = WIRSQuery<WRec>::merge(results);
+    auto merged = WIRSQuery<WRec>::merge(results, nullptr);
 
     ck_assert_int_eq(merged.size(), 2*k);
     for (size_t i=0; i<merged.size(); i++) {
diff --git a/tests/wss_tests.cpp b/tests/wss_tests.cpp
index 7dad5b9..d3bc5c0 100644
--- a/tests/wss_tests.cpp
+++ b/tests/wss_tests.cpp
@@ -240,7 +240,7 @@ START_TEST(t_wss_query_merge)
         WSSQuery<WRec>::delete_query_state(state2);
     }
 
-    auto merged = WSSQuery<WRec>::merge(results);
+    auto merged = WSSQuery<WRec>::merge(results, nullptr);
 
     ck_assert_int_eq(merged.size(), 2*k);
     for (size_t i=0; i<merged.size(); i++) {