summaryrefslogtreecommitdiff
path: root/src/common/fifo_queue.h
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-07 13:40:04 -0500
committerGravatar bunnei2014-12-07 13:40:04 -0500
commit2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch)
tree4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/fifo_queue.h
parentMerge pull request #252 from yuriks/patch-1 (diff)
parentChange NULLs to nullptrs. (diff)
downloadyuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.gz
yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.xz
yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.zip
Merge pull request #245 from rohit-n/null-nullptr
Change NULLs to nullptrs.
Diffstat (limited to '')
-rw-r--r--src/common/fifo_queue.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/fifo_queue.h b/src/common/fifo_queue.h
index 2c18285d4..b426e6596 100644
--- a/src/common/fifo_queue.h
+++ b/src/common/fifo_queue.h
@@ -57,7 +57,7 @@ public:
57 // advance the read pointer 57 // advance the read pointer
58 m_read_ptr = m_read_ptr->next; 58 m_read_ptr = m_read_ptr->next;
59 // set the next element to NULL to stop the recursive deletion 59 // set the next element to NULL to stop the recursive deletion
60 tmpptr->next = NULL; 60 tmpptr->next = nullptr;
61 delete tmpptr; // this also deletes the element 61 delete tmpptr; // this also deletes the element
62 } 62 }
63 63
@@ -86,7 +86,7 @@ private:
86 class ElementPtr 86 class ElementPtr
87 { 87 {
88 public: 88 public:
89 ElementPtr() : current(NULL), next(NULL) {} 89 ElementPtr() : current(nullptr), next(nullptr) {}
90 90
91 ~ElementPtr() 91 ~ElementPtr()
92 { 92 {