diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-08 21:39:04 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-05-08 21:39:04 +0200 |
| commit | fd9a5b1ff3b31f80d72283d6011459127dead282 (patch) | |
| tree | f88cc89e5476c37744c04a5e4a72b349f706d7e0 /common/storage/entitystore.cpp | |
| parent | a818e0471366be77a1ba4abc3ee7647a3050d9df (diff) | |
| download | sink-fd9a5b1ff3b31f80d72283d6011459127dead282.tar.gz sink-fd9a5b1ff3b31f80d72283d6011459127dead282.zip | |
Fixed merge implementation
Diffstat (limited to 'common/storage/entitystore.cpp')
| -rw-r--r-- | common/storage/entitystore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp index 38ff730..33c3c73 100644 --- a/common/storage/entitystore.cpp +++ b/common/storage/entitystore.cpp | |||
| @@ -66,7 +66,7 @@ template <typename First, typename ... Tail> | |||
| 66 | First merge(First f, Tail ...maps) | 66 | First merge(First f, Tail ...maps) |
| 67 | { | 67 | { |
| 68 | First map; | 68 | First map; |
| 69 | mergeImpl(f, maps...); | 69 | mergeImpl(map, f, maps...); |
| 70 | return map; | 70 | return map; |
| 71 | } | 71 | } |
| 72 | 72 | ||