Made AddDummyArgWrapper more flexible w.r.t. to const argument refs.

schlangster · schlangster · commit 5fad4405feca · 2014-05-19T15:56:40.000+02:00
diff --git a/include/react/Event.h b/include/react/Event.h
@@ -586,7 +586,7 @@ auto Filter(const Events<D,EventToken>& source, SignalPack<D,TDepValues...> depP
     using REACT_IMPL::AddDummyArgWrapper;
 
     using F = std::decay<FIn>::type;
-    using WrapperT = AddDummyArgWrapper<EventToken,F,bool,TDepValues...>;
+    using WrapperT = AddDummyArgWrapper<EventToken,F,bool,const TDepValues...>;
 
     struct NodeBuilder_
     {
@@ -714,7 +714,7 @@ auto Transform(const Events<D,EventToken>& source, SignalPack<D,TDepValues...> d
     using REACT_IMPL::AddDummyArgWrapper;
 
     using F = std::decay<FIn>::type;
-    using WrapperT = AddDummyArgWrapper<EventToken,F,TOut,TDepValues...>;
+    using WrapperT = AddDummyArgWrapper<EventToken,F,TOut,const TDepValues...>;
 
     struct NodeBuilder_
     {
diff --git a/include/react/Observer.h b/include/react/Observer.h
@@ -254,7 +254,7 @@ auto Observe(const Events<D,EventToken>& subject,
     using REACT_IMPL::AddDummyArgWrapper;
 
     using F = std::decay<FIn>::type;
-    using WrapperT = AddDummyArgWrapper<EventToken,F,void,TDepValues...>;
+    using WrapperT = AddDummyArgWrapper<EventToken,F,void,const TDepValues...>;
 
     struct NodeBuilder_
     {
diff --git a/include/react/common/Util.h b/include/react/common/Util.h
@@ -165,14 +165,32 @@ struct AddDummyArgWrapper
     AddDummyArgWrapper(const AddDummyArgWrapper& other) = default;
     AddDummyArgWrapper(AddDummyArgWrapper&& other) : MyFunc{ std::move(other.MyFunc) } {}
 
-    TRet operator()(TArg, const TDepValues& ... args)
+    TRet operator()(TArg, TDepValues& ... args)
     {
         return MyFunc(args ...);
     }
 
     F MyFunc;
 };
 
+template <typename TArg, typename F, typename ... TDepValues>
+struct AddDummyArgWrapper<TArg,F,void,TDepValues...>
+{
+    // Dummy int to make sure it calls the right ctor
+    template <typename FIn>
+    AddDummyArgWrapper(int, FIn&& func) : MyFunc{ std::forward<FIn>(func) } {}
+
+    AddDummyArgWrapper(const AddDummyArgWrapper& other) = default;
+    AddDummyArgWrapper(AddDummyArgWrapper&& other) : MyFunc{ std::move(other.MyFunc) } {}
+
+    void operator()(TArg, TDepValues& ... args)
+    {
+        MyFunc(args ...);
+    }
+
+    F MyFunc;
+};
+
 /****************************************/ REACT_IMPL_END /***************************************/
 
 namespace std

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ auto Filter(const Events<D,EventToken>& source, SignalPack<D,TDepValues...> depP`
`586`	`586`	`using REACT_IMPL::AddDummyArgWrapper;`
`587`	`587`
`588`	`588`	`using F = std::decay<FIn>::type;`
`589`		`- using WrapperT = AddDummyArgWrapper<EventToken,F,bool,TDepValues...>;`
	`589`	`+ using WrapperT = AddDummyArgWrapper<EventToken,F,bool,const TDepValues...>;`
`590`	`590`
`591`	`591`	`struct NodeBuilder_`
`592`	`592`	`{`
`@@ -714,7 +714,7 @@ auto Transform(const Events<D,EventToken>& source, SignalPack<D,TDepValues...> d`
`714`	`714`	`using REACT_IMPL::AddDummyArgWrapper;`
`715`	`715`
`716`	`716`	`using F = std::decay<FIn>::type;`
`717`		`- using WrapperT = AddDummyArgWrapper<EventToken,F,TOut,TDepValues...>;`
	`717`	`+ using WrapperT = AddDummyArgWrapper<EventToken,F,TOut,const TDepValues...>;`
`718`	`718`
`719`	`719`	`struct NodeBuilder_`
`720`	`720`	`{`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ auto Observe(const Events<D,EventToken>& subject,`
`254`	`254`	`using REACT_IMPL::AddDummyArgWrapper;`
`255`	`255`
`256`	`256`	`using F = std::decay<FIn>::type;`
`257`		`- using WrapperT = AddDummyArgWrapper<EventToken,F,void,TDepValues...>;`
	`257`	`+ using WrapperT = AddDummyArgWrapper<EventToken,F,void,const TDepValues...>;`
`258`	`258`
`259`	`259`	`struct NodeBuilder_`
`260`	`260`	`{`