summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/domain/typeimplementations_p.h2
-rw-r--r--common/storage/entitystore.cpp2
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>
41First merge(First f, Tail ...maps) 41First 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>
66First merge(First f, Tail ...maps) 66First 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