From 3227d58e748e79b2ba34f686d2903fb4cb893d57 Mon Sep 17 00:00:00 2001
From: Paul-Louis Ageneau <paul-louis@ageneau.org>
Date: Sun, 28 Feb 2021 17:10:39 +0100
Subject: [PATCH] Moved Queue to impl

---
 CMakeLists.txt                      | 2 +-
 include/rtc/datachannel.hpp         | 1 -
 include/rtc/track.hpp               | 1 -
 include/rtc/websocket.hpp           | 2 --
 {include/rtc => src/impl}/queue.hpp | 8 ++++----
 src/impl/track.hpp                  | 3 ++-
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename {include/rtc => src/impl}/queue.hpp (97%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47f4e55..66ac14e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,6 @@ set(LIBDATACHANNEL_HEADERS
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/log.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/message.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/peerconnection.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/queue.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/reliability.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtc.h
 	${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtc.hpp
@@ -137,6 +136,7 @@ set(LIBDATACHANNEL_IMPL_HEADERS
 	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/dtlstransport.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/icetransport.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/peerconnection.hpp
+	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/queue.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/logcounter.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/sctptransport.hpp
 	${CMAKE_CURRENT_SOURCE_DIR}/src/impl/threadpool.hpp
diff --git a/include/rtc/datachannel.hpp b/include/rtc/datachannel.hpp
index d3b1a36..a851b7a 100644
--- a/include/rtc/datachannel.hpp
+++ b/include/rtc/datachannel.hpp
@@ -22,7 +22,6 @@
 #include "channel.hpp"
 #include "common.hpp"
 #include "message.hpp"
-#include "queue.hpp"
 #include "reliability.hpp"
 
 #include <atomic>
diff --git a/include/rtc/track.hpp b/include/rtc/track.hpp
index 1cc49b0..03edbd9 100644
--- a/include/rtc/track.hpp
+++ b/include/rtc/track.hpp
@@ -24,7 +24,6 @@
 #include "common.hpp"
 #include "mediahandler.hpp"
 #include "message.hpp"
-#include "queue.hpp"
 
 #include <atomic>
 #include <shared_mutex>
diff --git a/include/rtc/websocket.hpp b/include/rtc/websocket.hpp
index 2fea8be..052182b 100644
--- a/include/rtc/websocket.hpp
+++ b/include/rtc/websocket.hpp
@@ -23,9 +23,7 @@
 
 #include "channel.hpp"
 #include "common.hpp"
-#include "init.hpp"
 #include "message.hpp"
-#include "queue.hpp"
 
 namespace rtc {
 
diff --git a/include/rtc/queue.hpp b/src/impl/queue.hpp
similarity index 97%
rename from include/rtc/queue.hpp
rename to src/impl/queue.hpp
index cdcc127..fe9f98a 100644
--- a/include/rtc/queue.hpp
+++ b/src/impl/queue.hpp
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RTC_QUEUE_H
-#define RTC_QUEUE_H
+#ifndef RTC_IMPL_QUEUE_H
+#define RTC_IMPL_QUEUE_H
 
 #include "common.hpp"
 
@@ -28,7 +28,7 @@
 #include <optional>
 #include <queue>
 
-namespace rtc {
+namespace rtc::impl {
 
 template <typename T> class Queue {
 public:
@@ -167,6 +167,6 @@ template <typename T> std::optional<T> Queue<T>::popImpl() {
 	return element;
 }
 
-} // namespace rtc
+} // namespace rtc::impl
 
 #endif
diff --git a/src/impl/track.hpp b/src/impl/track.hpp
index 57dd771..d57f2ae 100644
--- a/src/impl/track.hpp
+++ b/src/impl/track.hpp
@@ -20,9 +20,10 @@
 #define RTC_IMPL_TRACK_H
 
 #include "channel.hpp"
-#include "description.hpp"
 #include "common.hpp"
+#include "description.hpp"
 #include "mediahandler.hpp"
+#include "queue.hpp"
 
 #if RTC_ENABLE_MEDIA
 #include "dtlssrtptransport.hpp"