aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Dynamic/LinkedReference
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-06-19 23:20:06 -0300
committerariel- <ariel-@users.noreply.github.com>2017-06-19 23:20:06 -0300
commit85a7d5ce9ac68b30da2277cc91d4b70358f1880d (patch)
treedf3d2084ee2e35008903c03178039b9c986e2d08 /src/server/shared/Dynamic/LinkedReference
parent052fc24315ace866ea1cf610e85df119b68100c9 (diff)
Core: ported headers cleanup from master branch
Diffstat (limited to 'src/server/shared/Dynamic/LinkedReference')
-rw-r--r--src/server/shared/Dynamic/LinkedReference/Reference.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h
index c0c4ec21a80..4002de2d584 100644
--- a/src/server/shared/Dynamic/LinkedReference/Reference.h
+++ b/src/server/shared/Dynamic/LinkedReference/Reference.h
@@ -40,7 +40,7 @@ template <class TO, class FROM> class Reference : public LinkedListElement
// Tell our refFrom (source) object, that the link is cut (Target destroyed)
virtual void sourceObjectDestroyLink() = 0;
public:
- Reference() { iRefTo = NULL; iRefFrom = NULL; }
+ Reference() { iRefTo = nullptr; iRefFrom = nullptr; }
virtual ~Reference() { }
// Create new link
@@ -49,7 +49,7 @@ template <class TO, class FROM> class Reference : public LinkedListElement
ASSERT(fromObj); // fromObj MUST not be NULL
if (isValid())
unlink();
- if (toObj != NULL)
+ if (toObj != nullptr)
{
iRefTo = toObj;
iRefFrom = fromObj;
@@ -63,8 +63,8 @@ template <class TO, class FROM> class Reference : public LinkedListElement
{
targetObjectDestroyLink();
delink();
- iRefTo = NULL;
- iRefFrom = NULL;
+ iRefTo = nullptr;
+ iRefFrom = nullptr;
}
// Link is invalid due to destruction of referenced target object. Call comes from the refTo object
@@ -73,12 +73,12 @@ template <class TO, class FROM> class Reference : public LinkedListElement
{
sourceObjectDestroyLink();
delink();
- iRefTo = NULL;
+ iRefTo = nullptr;
}
bool isValid() const // Only check the iRefTo
{
- return iRefTo != NULL;
+ return iRefTo != nullptr;
}
Reference<TO, FROM> * next() { return((Reference<TO, FROM> *) LinkedListElement::next()); }