Make sure indirection doesn't remove constness

boostorg · Mar 23, 2016 · 088f81a · 088f81a
1 parent 2f1fd0c
commit 088f81a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/include/fit/indirect.hpp b/include/fit/indirect.hpp
@@ -99,7 +99,7 @@ struct indirect_adaptor<F*>
     {}
 
     template<class... Ts>
-    constexpr const F& base_function(Ts&&...) const
+    constexpr F& base_function(Ts&&...) const
     {
         return *f;
     }
@@ -114,7 +114,7 @@ struct indirect_adaptor<F*>
     constexpr FIT_SFINAE_RESULT(F, id_<Ts>...) 
     operator()(Ts&&... xs) const FIT_SFINAE_RETURNS
     (
-        (FIT_MANGLE_CAST(const F&)(FIT_CONST_THIS->base_function(xs...)))(FIT_FORWARD(Ts)(xs)...)
+        (FIT_MANGLE_CAST(F&)(FIT_CONST_THIS->base_function(xs...)))(FIT_FORWARD(Ts)(xs)...)
     );
 };
 

diff --git a/test/indirect.cpp b/test/indirect.cpp
@@ -11,3 +11,29 @@ FIT_TEST_CASE()
     FIT_TEST_CHECK(3 == fit::indirect(&f)(1, 2));
     FIT_TEST_CHECK(3 == fit::reveal(fit::indirect(&f))(1, 2));
 }
+
+struct mutable_function
+{
+    mutable_function() : value(0) {}
+    void operator()(int a) { value += a; }
+    int value;
+};
+
+FIT_TEST_CASE()
+{
+    auto mf = mutable_function{};
+    fit::indirect(&mf)(15);
+    fit::indirect(&mf)(2);
+    FIT_TEST_CHECK(mf.value == 17);
+}
+
+
+FIT_TEST_CASE()
+{
+    auto mf = std::make_shared<mutable_function>();
+    fit::indirect(mf)(15);
+    fit::indirect(mf)(2);
+    FIT_TEST_CHECK(mf->value == 17);
+}
+
+