From 064dfbc4f4dd48d1dd8fe53c9dc0d1c43c1d3f2d Mon Sep 17 00:00:00 2001 From: Azaezel Date: Tue, 13 Mar 2018 14:22:51 -0500 Subject: [PATCH] tsignal::order to ::mOrder. yet another potential conflict with a class member vs a method input --- Engine/source/core/util/tSignal.cpp | 6 +++--- Engine/source/core/util/tSignal.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Engine/source/core/util/tSignal.cpp b/Engine/source/core/util/tSignal.cpp index 30980a715..d323bec0c 100644 --- a/Engine/source/core/util/tSignal.cpp +++ b/Engine/source/core/util/tSignal.cpp @@ -28,9 +28,9 @@ void SignalBase::DelegateLink::insert(DelegateLink* node, F32 order) { // Note: can only legitimately be called on list head DelegateLink * walk = next; - while (order >= walk->order && walk->next != this) + while (order >= walk->mOrder && walk->next != this) walk = walk->next; - if (order >= walk->order) + if (order >= walk->mOrder) { // insert after walk node->prev = walk; @@ -46,7 +46,7 @@ void SignalBase::DelegateLink::insert(DelegateLink* node, F32 order) walk->prev->next = node; walk->prev = node; } - node->order = order; + node->mOrder = order; } void SignalBase::DelegateLink::unlink() diff --git a/Engine/source/core/util/tSignal.h b/Engine/source/core/util/tSignal.h index 4960ba8dd..f5531e217 100644 --- a/Engine/source/core/util/tSignal.h +++ b/Engine/source/core/util/tSignal.h @@ -53,7 +53,7 @@ public: SignalBase() { mList.next = mList.prev = &mList; - mList.order = 0.5f; + mList.mOrder = 0.5f; } ~SignalBase(); @@ -72,7 +72,7 @@ protected: struct DelegateLink { DelegateLink *next,*prev; - F32 order; + F32 mOrder; void insert(DelegateLink* node, F32 order); void unlink(); @@ -191,7 +191,7 @@ public: for ( DelegateLink *ptr = base.mList.next; ptr != &base.mList; ptr = ptr->next ) { DelegateLinkImpl *del = static_cast( ptr ); - notify( del->mDelegate, del->order ); + notify( del->mDelegate, del->mOrder ); } }