From 0556cac37d6c9e5e25d2620e9038988f912b0d14 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 12 Feb 2019 22:12:23 -0500
Subject: [PATCH] threadsafe_queue: Use std::size_t for representing size

Makes it consistent with the regular standard containers in terms of
size representation. This also gets rid of dependence on our own
type aliases, removing the need for an include.
---
 src/common/threadsafe_queue.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h
index c5fb7a27c..e10baed2e 100644
--- a/src/common/threadsafe_queue.h
+++ b/src/common/threadsafe_queue.h
@@ -7,12 +7,11 @@
 // a simple lockless thread-safe,
 // single reader, single writer queue
 
-#include <algorithm>
 #include <atomic>
 #include <condition_variable>
 #include <cstddef>
 #include <mutex>
-#include "common/common_types.h"
+#include <utility>
 
 namespace Common {
 template <typename T>
@@ -26,7 +25,7 @@ public:
         delete read_ptr;
     }
 
-    u32 Size() const {
+    std::size_t Size() const {
         return size.load();
     }
 
@@ -47,9 +46,9 @@ public:
         ElementPtr* new_ptr = new ElementPtr();
         write_ptr->next.store(new_ptr, std::memory_order_release);
         write_ptr = new_ptr;
-        cv.notify_one();
-
         ++size;
+
+        cv.notify_one();
     }
 
     void Pop() {
@@ -99,7 +98,7 @@ private:
     // and a pointer to the next ElementPtr
     class ElementPtr {
     public:
-        ElementPtr() : next(nullptr) {}
+        ElementPtr() = default;
         ~ElementPtr() {
             ElementPtr* next_ptr = next.load();
 
@@ -108,12 +107,12 @@ private:
         }
 
         T current;
-        std::atomic<ElementPtr*> next;
+        std::atomic<ElementPtr*> next{nullptr};
     };
 
     ElementPtr* write_ptr;
     ElementPtr* read_ptr;
-    std::atomic<u32> size;
+    std::atomic_size_t size{0};
     std::mutex cv_mutex;
     std::condition_variable cv;
 };
@@ -124,7 +123,7 @@ private:
 template <typename T>
 class MPSCQueue {
 public:
-    u32 Size() const {
+    std::size_t Size() const {
         return spsc_queue.Size();
     }