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 | |
| parent | a818e0471366be77a1ba4abc3ee7647a3050d9df (diff) | |
| download | sink-fd9a5b1ff3b31f80d72283d6011459127dead282.tar.gz sink-fd9a5b1ff3b31f80d72283d6011459127dead282.zip | |
Fixed merge implementation
| -rw-r--r-- | common/domain/typeimplementations_p.h | 2 | ||||
| -rw-r--r-- | common/storage/entitystore.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/domain/typeimplementations_p.h b/common/domain/typeimplementations_p.h index b7a78ac..6f77a2d 100644 --- a/common/domain/typeimplementations_p.h +++ b/common/domain/typeimplementations_p.h | |||
| @@ -41,7 +41,7 @@ template <typename First, typename ... Tail> | |||
| 41 | First merge(First f, Tail ...maps) | 41 | First merge(First f, Tail ...maps) |
| 42 | { | 42 | { |
| 43 | First map; | 43 | First map; |
| 44 | mergeImpl(f, maps...); | 44 | mergeImpl(map, f, maps...); |
| 45 | return map; | 45 | return map; |
| 46 | } | 46 | } |
| 47 | 47 | ||
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 | ||