Skip to content

Commit 68d39c8

Browse files
schlangsterschlangster
committed
Cleanup. ICC compile fails with weird errors at the moment. Probably related to this bug: http://software.intel.com/en-us/forums/topic/501502 
1 parent ae5ac0f commit 68d39c8

2 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎include/react/Signal.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ template
121121
class TempSignal : public Signal<D,S>
122122
{
123123
protected:
124-
using NodeT = REACT_IMPL::OpSignalNode<D,S,TOp>;
124+
using NodeT = REACT_IMPL::SignalOpNode<D,S,TOp>;
125125

126126
public:
127127
TempSignal() :
@@ -236,7 +236,7 @@ auto MakeSignal(F&& func, const Signal<D,TArgs>& ... args)
236236
"react::MakeSignal requires at least 1 signal dependency.");
237237

238238
return TempSignal<D,S,TOp>(
239-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>(
239+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>(
240240
std::forward<F>(func), args.GetPtr() ... ));
241241
}
242242

@@ -265,7 +265,7 @@ auto operator ## op(const TSignal& arg)
265265
-> TempSignal<D,S,TOp> \
266266
{ \
267267
return TempSignal<D,S,TOp>( \
268-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
268+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
269269
F(), arg.GetPtr())); \
270270
}
271271

@@ -358,7 +358,7 @@ auto operator ## op(const TLeftSignal& lhs, const TRightSignal& rhs)
358358
-> TempSignal<D,S,TOp> \
359359
{ \
360360
return TempSignal<D,S,TOp>( \
361-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
361+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
362362
F(), lhs.GetPtr(), rhs.GetPtr())); \
363363
} \
364364
\
@@ -382,7 +382,7 @@ auto operator ## op(const TLeftSignal& lhs, TRightValIn&& rhs)
382382
-> TempSignal<D,S,TOp> \
383383
{ \
384384
return TempSignal<D,S,TOp>( \
385-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
385+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
386386
F(std::forward<TRightValIn>(rhs)), lhs.GetPtr())); \
387387
} \
388388
\
@@ -406,7 +406,7 @@ auto operator ## op(TLeftValIn&& lhs, const TRightSignal& rhs)
406406
-> TempSignal<D,S,TOp> \
407407
{ \
408408
return TempSignal<D,S,TOp>( \
409-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
409+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
410410
F(std::forward<TLeftValIn>(lhs)), rhs.GetPtr())); \
411411
} \
412412
template \
@@ -425,7 +425,7 @@ auto operator ## op(TempSignal<D,TLeftVal,TLeftOp>&& lhs,
425425
-> TempSignal<D,S,TOp> \
426426
{ \
427427
return TempSignal<D,S,TOp>( \
428-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
428+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
429429
F(), lhs.StealOp(), rhs.StealOp())); \
430430
} \
431431
\
@@ -449,7 +449,7 @@ template
449449
-> TempSignal<D,S,TOp> \
450450
{ \
451451
return TempSignal<D,S,TOp>( \
452-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
452+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
453453
F(), lhs.StealOp(), rhs.GetPtr())); \
454454
} \
455455
\
@@ -472,7 +472,7 @@ auto operator ## op(const TLeftSignal& lhs, TempSignal<D,TRightVal,TRightOp>&& r
472472
-> TempSignal<D,S,TOp> \
473473
{ \
474474
return TempSignal<D,S,TOp>( \
475-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
475+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
476476
F(), lhs.GetPtr(), rhs.StealOp())); \
477477
} \
478478
\
@@ -493,7 +493,7 @@ auto operator ## op(TempSignal<D,TLeftVal,TLeftOp>&& lhs, TRightValIn&& rhs)
493493
-> TempSignal<D,S,TOp> \
494494
{ \
495495
return TempSignal<D,S,TOp>( \
496-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
496+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
497497
F(std::forward<TRightValIn>(rhs)), lhs.StealOp())); \
498498
} \
499499
\
@@ -514,7 +514,7 @@ auto operator ## op(TLeftValIn&& lhs, TempSignal<D,TRightVal,TRightOp>&& rhs)
514514
-> TempSignal<D,S,TOp> \
515515
{ \
516516
return TempSignal<D,S,TOp>( \
517-
std::make_shared<REACT_IMPL::OpSignalNode<D,S,TOp>>( \
517+
std::make_shared<REACT_IMPL::SignalOpNode<D,S,TOp>>( \
518518
F(std::forward<TLeftValIn>(lhs)), rhs.StealOp())); \
519519
}
520520

‎include/react/graph/SignalNodes.h‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ class FunctionOp
158158
FunctionOp(FunctionOp&& other) :
159159
deps_{ std::move(other.deps_) },
160160
func_{ std::move(other.func_) }
161-
{
162-
}
161+
{}
163162

164163
// Can't be copied, only moved
165164
FunctionOp() = delete;
@@ -237,7 +236,7 @@ class FunctionOp
237236

238237
S operator()(const TArgs& ... args) const
239238
{
240-
return MyFunc(Helper<std::decay<decltype(args)>::type>::eval(args) ...);
239+
return MyFunc(Helper<typename std::decay<decltype(args)>::type>::eval(args) ...);
241240
}
242241

243242
const F& MyFunc;
@@ -251,7 +250,9 @@ class FunctionOp
251250

252251
void operator()(const TArgs& ... args) const
253252
{
254-
REACT_EXPAND_PACK(Helper<std::decay<decltype(args)>::type>::attach<D>(MyNode, args));
253+
REACT_EXPAND_PACK(
254+
Helper<typename std::decay<decltype(args)>::type>::
255+
template attach<D>(MyNode, args));
255256
}
256257

257258
TNode& MyNode;
@@ -265,7 +266,9 @@ class FunctionOp
265266

266267
void operator()(const TArgs& ... args) const
267268
{
268-
REACT_EXPAND_PACK(Helper<std::decay<decltype(args)>::type>::detach<D>(MyNode, args));
269+
REACT_EXPAND_PACK(
270+
Helper<typename std::decay<decltype(args)>::type>::
271+
template detach<D>(MyNode, args));
269272
}
270273

271274
TNode& MyNode;
@@ -298,19 +301,19 @@ class FunctionOp
298301
};
299302

300303
///////////////////////////////////////////////////////////////////////////////////////////////////
301-
/// OpSignalNode
304+
/// SignalOpNode
302305
///////////////////////////////////////////////////////////////////////////////////////////////////
303306
template
304307
<
305308
typename D,
306309
typename S,
307310
typename TOp
308311
>
309-
class OpSignalNode : public SignalNode<D,S>
312+
class SignalOpNode : public SignalNode<D,S>
310313
{
311314
public:
312315
template <typename ... TArgs>
313-
OpSignalNode(TArgs&& ... args) :
316+
SignalOpNode(TArgs&& ... args) :
314317
SignalNode<D, S>(),
315318
op_{ std::forward<TArgs>(args) ... }
316319
{
@@ -320,14 +323,14 @@ class OpSignalNode : public SignalNode<D,S>
320323
op_.Attach<D>(*this);
321324
}
322325

323-
~OpSignalNode()
326+
~SignalOpNode()
324327
{
325328
if (!wasOpStolen_)
326329
op_.Detach<D>(*this);
327330
Engine::OnNodeDestroy(*this);
328331
}
329332

330-
virtual const char* GetNodeType() const override { return "OpSignalNode"; }
333+
virtual const char* GetNodeType() const override { return "SignalOpNode"; }
331334

332335
virtual void Tick(void* turnPtr) override
333336
{

0 commit comments

Comments
 (0)