From 1b0ac23a69b22ec81d1899f920865515989d774e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 1 Dec 2020 00:38:19 +0100
Subject: [PATCH] Get rid of Executor.cpp/h.

There was only one implementation.
---
 Common/Common.vcxproj                   | 1 -
 Common/Net/HTTPServer.cpp               | 6 +++++-
 Common/Net/HTTPServer.h                 | 6 ++++--
 UWP/CommonUWP/CommonUWP.vcxproj         | 2 --
 UWP/CommonUWP/CommonUWP.vcxproj.filters | 6 ------
 android/jni/Android.mk                  | 4 ----
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index e4264b4f20..e7e98436fa 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -529,7 +529,6 @@
     <ClInclude Include="System\System.h" />
     <ClInclude Include="Thread\Channel.h" />
     <ClInclude Include="Thread\Event.h" />
-    <ClInclude Include="Thread\Executor.h" />
     <ClInclude Include="Thread\ParallelLoop.h" />
     <ClInclude Include="Thread\Promise.h" />
     <ClInclude Include="Thread\ThreadManager.h" />
diff --git a/Common/Net/HTTPServer.cpp b/Common/Net/HTTPServer.cpp
index 05456c3437..e56a5b9a6a 100644
--- a/Common/Net/HTTPServer.cpp
+++ b/Common/Net/HTTPServer.cpp
@@ -33,14 +33,18 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <thread>
 
 #include "Common/Net/HTTPServer.h"
 #include "Common/Net/NetBuffer.h"
 #include "Common/Net/Sinks.h"
 #include "Common/File/FileDescriptor.h"
+
+#include "Common/Buffer.h"
 #include "Common/Log.h"
 
-void NewThreadExecutor::Run(std::function<void()> &&func) {
+
+void NewThreadExecutor::Run(std::function<void()> func) {
 	threads_.push_back(std::thread(func));
 }
 
diff --git a/Common/Net/HTTPServer.h b/Common/Net/HTTPServer.h
index a88137398b..40e336bb5a 100644
--- a/Common/Net/HTTPServer.h
+++ b/Common/Net/HTTPServer.h
@@ -10,16 +10,18 @@
 class NewThreadExecutor {
 public:
 	~NewThreadExecutor();
-	void Run(std::function<void()> &&func);
+	void Run(std::function<void()> func);
 
 private:
 	std::vector<std::thread> threads_;
 };
 
 namespace net {
+
 class InputSink;
 class OutputSink;
-};
+
+}  // namespace net
 
 namespace http {
 
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj b/UWP/CommonUWP/CommonUWP.vcxproj
index feb79abb97..e91ec0d58b 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj
+++ b/UWP/CommonUWP/CommonUWP.vcxproj
@@ -486,7 +486,6 @@
     <ClInclude Include="..\..\Common\System\Display.h" />
     <ClInclude Include="..\..\Common\System\NativeApp.h" />
     <ClInclude Include="..\..\Common\System\System.h" />
-    <ClInclude Include="..\..\Common\Thread\Executor.h" />
     <ClInclude Include="..\..\Common\Thread\Channel.h" />
     <ClInclude Include="..\..\Common\Thread\Promise.h" />
     <ClInclude Include="..\..\Common\Thread\ThreadUtil.h" />
@@ -599,7 +598,6 @@
     <ClCompile Include="..\..\Common\OSVersion.cpp" />
     <ClCompile Include="..\..\Common\StringUtils.cpp" />
     <ClCompile Include="..\..\Common\System\Display.cpp" />
-    <ClCompile Include="..\..\Common\Thread\Executor.cpp" />
     <ClCompile Include="..\..\Common\Thread\ThreadUtil.cpp" />
     <ClCompile Include="..\..\Common\Thread\ThreadManager.cpp" />
     <ClCompile Include="..\..\Common\Thread\ParallelLoop.cpp" />
diff --git a/UWP/CommonUWP/CommonUWP.vcxproj.filters b/UWP/CommonUWP/CommonUWP.vcxproj.filters
index 5755c6567a..a72807393e 100644
--- a/UWP/CommonUWP/CommonUWP.vcxproj.filters
+++ b/UWP/CommonUWP/CommonUWP.vcxproj.filters
@@ -180,9 +180,6 @@
     <ClCompile Include="..\..\Common\Input\InputState.cpp">
       <Filter>Input</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Common\Thread\Executor.cpp">
-      <Filter>Thread</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Common\Thread\ThreadManager.cpp">
       <Filter>Thread</Filter>
     </ClCompile>
@@ -460,9 +457,6 @@
     <ClInclude Include="..\..\Common\Input\KeyCodes.h">
       <Filter>Input</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Common\Thread\Executor.h">
-      <Filter>Thread</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Common\Thread\Channel.h">
       <Filter>Thread</Filter>
     </ClInclude>
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index e2f73f3b1d..07c08e320f 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -285,11 +285,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Net/WebsocketServer.cpp \
   $(SRC)/Common/Profiler/Profiler.cpp \
   $(SRC)/Common/System/Display.cpp \
-<<<<<<< HEAD
-  $(SRC)/Common/Thread/PrioritizedWorkQueue.cpp \
-=======
   $(SRC)/Common/Thread/Executor.cpp \
->>>>>>> 82282c7a3 (Get rid of the PrioritizedWorkQueue. Instead just queue tasks on the ThreadManager.)
   $(SRC)/Common/Thread/ThreadUtil.cpp \
   $(SRC)/Common/Thread/ThreadManager.cpp \
   $(SRC)/Common/Thread/ParallelLoop.cpp \