Merge branch 'master' into cxx17

src/EC/ThreadPool.hpp

@@ -172,6 +172,13 @@ public:
         return fnQueue.empty();
     }
 
+    /*!
+        \brief Returns the ThreadCount that this class was created with.
+     */
+    constexpr unsigned int getThreadCount() {
+        return SIZE;
+    }
+
 private:
     std::vector<std::thread> threads;
     std::atomic_bool isAlive;

src/test/ThreadPoolTest.cpp

@@ -66,3 +66,14 @@ TEST(ECThreadPool, Simple) {
 
     ASSERT_EQ(data.load(), 11);
 }
+
+TEST(ECThreadPool, QueryCount) {
+    {
+        OneThreadPool oneP;
+        ASSERT_EQ(1, oneP.getThreadCount());
+    }
+    {
+        ThreeThreadPool threeP;
+        ASSERT_EQ(3, threeP.getThreadCount());
+    }
+}