From 5a4fb7f83202d348b12862627f251015b2e621be Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Tue, 14 Mar 2017 22:40:47 +0200
Subject: [PATCH] Fix function application in mp_map_update

---
 include/boost/mp11/map.hpp | 8 ++------
 test/mp_map_update.cpp     | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/boost/mp11/map.hpp b/include/boost/mp11/map.hpp
index 9350b70..b12f48c 100644
--- a/include/boost/mp11/map.hpp
+++ b/include/boost/mp11/map.hpp
@@ -53,12 +53,8 @@ template<class M, class T, template<class...> class F> struct mp_map_update_impl
 {
     template<class U> using _f = std::is_same<mp_first<T>, mp_first<U>>;
 
-    // _f2<L<X, Y...>> -> F<Y...>
-    // _f2<pair<X, Y>> -> F<Y>
-    template<class L> using _f2 = mp_rename<mp_rest<mp_rename<L, mp_list>>, F>;
-
-    // _f3<L<X, Y...>> -> L<X, F<Y...>>
-    template<class L> using _f3 = mp_assign<L, mp_list<mp_first<L>, _f2<L>>>;
+    // _f3<L<X, Y...>> -> L<X, F<X, Y...>>
+    template<class L> using _f3 = mp_assign<L, mp_list<mp_first<L>, mp_rename<L, F>>>;
 
     using type = mp_if< mp_map_contains<M, mp_first<T>>, mp_transform_if<_f, _f3, M>, mp_push_back<M, T> >;
 };
diff --git a/test/mp_map_update.cpp b/test/mp_map_update.cpp
index d957806..0069072 100644
--- a/test/mp_map_update.cpp
+++ b/test/mp_map_update.cpp
@@ -17,7 +17,7 @@
 
 using boost::mp_int;
 
-template<class T> using inc = mp_int<T::value + 1>;
+template<class T, class U> using inc = mp_int<U::value + 1>;
 
 int main()
 {