Merge pip2

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

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

tests/concurrent/ExecutorIntegrationTest.cpp

@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "pithreadpoolexecutor.h"
+#include "piexecutor.h"
 #include "pimutex.h"
 #include "testutil.h"
 

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::_;