From 41e54e58592722ecce67635c181787b7a40edc0d Mon Sep 17 00:00:00 2001
From: Stepan <stepannk@mail.ru>
Date: Mon, 3 Aug 2020 17:47:19 +0300
Subject: [PATCH] Merge pip2

---
 .../thread/{pithreadpoolexecutor.cpp => piexecutor.cpp}   | 0
 lib/main/thread/{pithreadpoolexecutor.h => piexecutor.h}  | 8 ++++----
 lib/main/thread/pithreadmodule.h                          | 2 +-
 tests/concurrent/ExecutorIntegrationTest.cpp              | 2 +-
 tests/concurrent/ExecutorUnitTest.cpp                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/main/thread/{pithreadpoolexecutor.cpp => piexecutor.cpp} (100%)
 rename lib/main/thread/{pithreadpoolexecutor.h => piexecutor.h} (96%)

diff --git a/lib/main/thread/pithreadpoolexecutor.cpp b/lib/main/thread/piexecutor.cpp
similarity index 100%
rename from lib/main/thread/pithreadpoolexecutor.cpp
rename to lib/main/thread/piexecutor.cpp
diff --git a/lib/main/thread/pithreadpoolexecutor.h b/lib/main/thread/piexecutor.h
similarity index 96%
rename from lib/main/thread/pithreadpoolexecutor.h
rename to lib/main/thread/piexecutor.h
index 02895181..60ee6f99 100644
--- a/lib/main/thread/pithreadpoolexecutor.h
+++ b/lib/main/thread/piexecutor.h
@@ -17,8 +17,8 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef PIP_EXECUTOR_H
-#define PIP_EXECUTOR_H
+#ifndef PIEXECUTOR_H
+#define PIEXECUTOR_H
 
 #include "piblockingdequeue.h"
 #include <atomic>
@@ -31,7 +31,7 @@
  * TODO adapt documentation to template
  */
 template <typename Thread_, typename Dequeue_>
-class PIP_EXPORT PIThreadPoolExecutorTemplate {
+class PIThreadPoolExecutorTemplate {
 public:
 	explicit PIThreadPoolExecutorTemplate(size_t corePoolSize = 1) : isShutdown_(false) { makePool(corePoolSize); }
 
@@ -108,4 +108,4 @@ protected:
 typedef PIThreadPoolExecutorTemplate<PIThread, PIBlockingDequeue<std::function<void()> > > PIThreadPoolExecutor;
 
 
-#endif //PIP_EXECUTOR_H
+#endif //PIEXECUTOR_H
diff --git a/lib/main/thread/pithreadmodule.h b/lib/main/thread/pithreadmodule.h
index 5973dfe4..c38289ac 100644
--- a/lib/main/thread/pithreadmodule.h
+++ b/lib/main/thread/pithreadmodule.h
@@ -25,7 +25,7 @@
 #include "pitimer.h"
 #include "pipipelinethread.h"
 #include "pigrabberbase.h"
-#include "pithreadpoolexecutor.h"
+#include "piexecutor.h"
 #include "piconditionvar.h"
 
 #endif // PITHREADMODULE_H
diff --git a/tests/concurrent/ExecutorIntegrationTest.cpp b/tests/concurrent/ExecutorIntegrationTest.cpp
index 9485521f..326eca91 100644
--- a/tests/concurrent/ExecutorIntegrationTest.cpp
+++ b/tests/concurrent/ExecutorIntegrationTest.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "pithreadpoolexecutor.h"
+#include "piexecutor.h"
 #include "pimutex.h"
 #include "testutil.h"
 
diff --git a/tests/concurrent/ExecutorUnitTest.cpp b/tests/concurrent/ExecutorUnitTest.cpp
index ac6adde3..493f6d71 100644
--- a/tests/concurrent/ExecutorUnitTest.cpp
+++ b/tests/concurrent/ExecutorUnitTest.cpp
@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
-#include "executor.h"
+#include "piexecutor.h"
 #include "testutil.h"
 
 using ::testing::_;