Skip to content

Commit db71209

Browse files
committed
Too much magic.
1 parent 9c7017e commit db71209

2 files changed

Lines changed: 0 additions & 37 deletions

File tree

include/react/Signal.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -690,30 +690,6 @@ class SignalList
690690
data_{ std::tuple_cat(curArgs.data_, std::tie(newArg)) }
691691
{}
692692

693-
template <typename TEvent, typename F>
694-
Observer<D> Observe(const TEvent& evn, F&& f) const
695-
{
696-
struct Wrapper_
697-
{
698-
Wrapper_(const TEvent& evn, F&& func) :
699-
MyEvent{ evn },
700-
MyFunc{ std::forward<F>(func) }
701-
{}
702-
703-
Observer<D> operator()(const Signal<D,TValues>& ... deps)
704-
{
705-
return REACT::Observe(MyEvent, std::forward<F>(MyFunc), deps ...);
706-
}
707-
708-
const TEvent& MyEvent;
709-
710-
// Stored as universal ref
711-
F MyFunc;
712-
};
713-
714-
return REACT_IMPL::apply(Wrapper_{ evn, std::forward<F>(f) }, data_);
715-
}
716-
717693
private:
718694
std::tuple<const Signal<D, TValues>& ...> data_;
719695

src/test/ObserverTest.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,6 @@ TYPED_TEST_P(ObserverTest, SyncedObserveTest)
144144
auto src1 = MyDomain::MakeEventSource();
145145
auto src2 = MyDomain::MakeEventSource<int>();
146146

147-
(sum,prod,diff).Observe(src1, [] (int sum, int prod, int diff) {
148-
ASSERT_EQ(sum, 33);
149-
ASSERT_EQ(prod, 242);
150-
ASSERT_EQ(diff, 11);
151-
});
152-
153-
(sum,prod,diff).Observe(src2, [] (int e, int sum, int prod, int diff) {
154-
ASSERT_EQ(e, 42);
155-
ASSERT_EQ(sum, 33);
156-
ASSERT_EQ(prod, 242);
157-
ASSERT_EQ(diff, 11);
158-
});
159-
160147
Observe(src1, [] (int sum, int prod, int diff) {
161148
ASSERT_EQ(sum, 33);
162149
ASSERT_EQ(prod, 242);

0 commit comments

Comments
 (0)