From fd9a5b1ff3b31f80d72283d6011459127dead282 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 8 May 2017 21:39:04 +0200
Subject: Fixed merge implementation

---
 common/domain/typeimplementations_p.h | 2 +-
 common/storage/entitystore.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'common')

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>
 First merge(First f, Tail ...maps)
 {
     First map;
-    mergeImpl(f, maps...);
+    mergeImpl(map, f, maps...);
     return map;
 }
 
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>
 First merge(First f, Tail ...maps)
 {
     First map;
-    mergeImpl(f, maps...);
+    mergeImpl(map, f, maps...);
     return map;
 }
 
-- 
cgit v1.2.3