From 4538b20e730553062f9e55ab68f1cb272c5f9caf Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 3 Sep 2019 10:13:27 -0400
Subject: [PATCH 1/2] Listener: Use C++17 deduction guides for mutex locks

Same thing, but without hardcoding the mutex type.
---
 lib/Listener.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Listener.cpp b/lib/Listener.cpp
index 24be0a4..ef96522 100644
--- a/lib/Listener.cpp
+++ b/lib/Listener.cpp
@@ -64,7 +64,7 @@ void Listener::listenerProc() {
 #endif
     }
     if (acceptData && acceptClock) {
-      std::unique_lock<std::mutex> lk(m_queueLock);
+      std::unique_lock lk{m_queueLock};
       m_endpointQueue.push(std::make_unique<Endpoint>(0, std::move(acceptData), std::move(acceptClock)));
     }
     WaitGCTicks(GetGCTicksPerSec());
@@ -90,7 +90,7 @@ void Listener::stop() {
 }
 
 std::unique_ptr<Endpoint> Listener::accept() {
-  std::unique_lock<std::mutex> lk(m_queueLock);
+  std::unique_lock lk{m_queueLock};
   if (m_endpointQueue.size()) {
     std::unique_ptr<Endpoint> ret;
     ret = std::move(m_endpointQueue.front());

From 33908dd86a09b417ef32145cd3b82927dd4540bd Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 3 Sep 2019 10:15:31 -0400
Subject: [PATCH 2/2] Listener: Simplify assignment within accept()

We can just assign to the ret variable directly.
---
 lib/Listener.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Listener.cpp b/lib/Listener.cpp
index ef96522..f24f459 100644
--- a/lib/Listener.cpp
+++ b/lib/Listener.cpp
@@ -91,13 +91,13 @@ void Listener::stop() {
 
 std::unique_ptr<Endpoint> Listener::accept() {
   std::unique_lock lk{m_queueLock};
-  if (m_endpointQueue.size()) {
-    std::unique_ptr<Endpoint> ret;
-    ret = std::move(m_endpointQueue.front());
-    m_endpointQueue.pop();
-    return ret;
+  if (m_endpointQueue.empty()) {
+    return nullptr;
   }
-  return {};
+
+  auto ret = std::move(m_endpointQueue.front());
+  m_endpointQueue.pop();
+  return ret;
 }
 
 Listener::Listener() = default;