Added a default type for *ReturnValCapt.

Author: FranckRJ

include/fakeit/StubbingProgress.hpp

@@ -90,7 +90,7 @@ namespace fakeit {
                 static_assert(sizeof(U) != sizeof(U), "AlwaysReturn() cannot take an rvalue references for functions returning a reference because it would make it dangling, use AlwaysReturnValCapt() instead.");
             }
 
-            template<typename T>
+            template<typename T = R>
             MethodStubbingProgress<R, arglist...>& ReturnValCapt(T&& r) {
                 // If a ref to T can be cast to a ref to R, then store T.
                 // Otherwise, create an object R constructed from the received T and store it.
@@ -104,7 +104,7 @@ namespace fakeit {
                 });
             }
 
-            template<typename T>
+            template<typename T = R>
             void AlwaysReturnValCapt(T&& r) {
                 // If a ref to T can be cast to a ref to R, then store T.
                 // Otherwise, create an object R constructed from the received T and store it.

tests/return_template_specialization.cpp

@@ -46,7 +46,8 @@ struct ReturnTemplateSpecializationTests : tpunit::TestFixture {
             TEST(ReturnTemplateSpecializationTests::always_return_valspecialization_from_other_type_variable),
             TEST(ReturnTemplateSpecializationTests::always_return_refspecialization_from_other_type_variable),
             TEST(ReturnTemplateSpecializationTests::always_return_valcapt_from_other_type_variable),
-            TEST(ReturnTemplateSpecializationTests::always_return_refcapt_from_other_type_variable)
+            TEST(ReturnTemplateSpecializationTests::always_return_refcapt_from_other_type_variable),
+            TEST(ReturnTemplateSpecializationTests::test_implicitly_deduced_type)
         ) {
     }
 
@@ -67,6 +68,10 @@ struct ReturnTemplateSpecializationTests : tpunit::TestFixture {
         virtual std::string returnVal() = 0;
 
         virtual MoveOnly returnValMo() = 0;
+
+        virtual std::pair<int, int> returnPair() = 0;
+
+        virtual const std::pair<int, int>& returnRefPair() = 0;
     };
 
     void return_default_from_same_type_temp() {
@@ -833,4 +838,26 @@ struct ReturnTemplateSpecializationTests : tpunit::TestFixture {
         }
     }
 
+    void test_implicitly_deduced_type() {
+        Mock<SomeStruct> mock;
+
+        When(Method(mock, returnPair)).ReturnValCapt({1, 2});
+        ASSERT_EQUAL(mock.get().returnPair(), (std::pair<int, int>{1, 2}));
+        Verify(Method(mock, returnPair)).Once();
+
+        When(Method(mock, returnRefPair)).ReturnValCapt({10, 20});
+        ASSERT_EQUAL(mock.get().returnRefPair(), (std::pair<int, int>{10, 20}));
+        Verify(Method(mock, returnRefPair)).Once();
+
+        When(Method(mock, returnPair)).AlwaysReturnValCapt({3, 4});
+        ASSERT_EQUAL(mock.get().returnPair(), (std::pair<int, int>{3, 4}));
+        ASSERT_EQUAL(mock.get().returnPair(), (std::pair<int, int>{3, 4}));
+        Verify(Method(mock, returnPair)).Exactly(3);
+
+        When(Method(mock, returnRefPair)).AlwaysReturnValCapt({30, 40});
+        ASSERT_EQUAL(mock.get().returnRefPair(), (std::pair<int, int>{30, 40}));
+        ASSERT_EQUAL(mock.get().returnRefPair(), (std::pair<int, int>{30, 40}));
+        Verify(Method(mock, returnRefPair)).Exactly(3);
+    }
+
 } __ReturnTemplateSpecializationTests;