diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/framework/DynamicExtension.h | 2 | ||||
| -rw-r--r-- | include/shard/MemISAM.h | 2 | ||||
| -rw-r--r-- | include/shard/PGM.h | 2 | ||||
| -rw-r--r-- | include/shard/TrieSpline.h | 2 | ||||
| -rw-r--r-- | include/shard/WIRS.h | 2 | ||||
| -rw-r--r-- | include/shard/WSS.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h index 242db8e..bd09e1f 100644 --- a/include/framework/DynamicExtension.h +++ b/include/framework/DynamicExtension.h @@ -134,7 +134,7 @@ public: } // Merge the results together - auto result = Q::merge(query_results); + auto result = Q::merge(query_results, parms); for (size_t i=0; i<states.size(); i++) { Q::delete_query_state(states[i]); 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++) { diff --git a/include/shard/PGM.h b/include/shard/PGM.h index 20bdbf2..d72ad55 100644 --- a/include/shard/PGM.h +++ b/include/shard/PGM.h @@ -341,7 +341,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) { size_t total = 0; for (size_t i=0; i<results.size(); i++) { total += results[i].size(); 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++) { diff --git a/include/shard/WIRS.h b/include/shard/WIRS.h index fa071da..9760443 100644 --- a/include/shard/WIRS.h +++ b/include/shard/WIRS.h @@ -547,7 +547,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++) { diff --git a/include/shard/WSS.h b/include/shard/WSS.h index b2dbb96..94c7ad3 100644 --- a/include/shard/WSS.h +++ b/include/shard/WSS.h @@ -414,7 +414,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++) { |