Merge pull request #2 from MirrorYuChen/feat/chenjingyu/C++11

Feat/chenjingyu/c++11

.gitignore

@@ -2,3 +2,5 @@
 /cmake-build-release/
 /.idea/
 .DS_Store
+build*/
+.vscode/

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.2.5)
 
 project(CThreadPool VERSION 1.0.1)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 11)
 
 # add CThreadPool environment info
 include(cmake/CThreadPool-env-include.cmake)

src/UtilsCtrl/ThreadPool/Queue/UAtomicPriorityQueue.h

@@ -12,6 +12,7 @@
 #include <queue>
 
 #include "UQueueObject.h"
+#include "../../UMemory.h"
 
 CGRAPH_NAMESPACE_BEGIN
 
@@ -64,7 +65,7 @@ public:
      * @return
      */
     CVoid push(T&& value, int priority) {
-        std::unique_ptr<T> task(std::make_unique<T>(std::move(value), priority));
+        std::unique_ptr<T> task(make_unique<T>(std::move(value), priority));
         CGRAPH_LOCK_GUARD lk(mutex_);
         priority_queue_.push(std::move(task));
     }

src/UtilsCtrl/ThreadPool/Queue/UAtomicQueue.h

@@ -15,6 +15,7 @@
 #include <condition_variable>
 
 #include "../UThreadPoolDefine.h"
+#include "../../UMemory.h"
 #include "UQueueObject.h"
 
 CGRAPH_NAMESPACE_BEGIN
@@ -104,7 +105,7 @@ public:
      * @param value
      */
     CVoid push(T&& value) {
-        std::unique_ptr<T> task(std::make_unique<T>(std::move(value)));
+        std::unique_ptr<T> task(make_unique<T>(std::move(value)));
         CGRAPH_LOCK_GUARD lk(mutex_);
         queue_.push(std::move(task));
         cv_.notify_one();

src/UtilsCtrl/UAllocator.h

@@ -14,7 +14,7 @@
 #endif
 
 #include <mutex>
-#include &lt;memory>;
+#include &#34;UMemory.h";
 
 CGRAPH_NAMESPACE_BEGIN
 
@@ -31,7 +31,7 @@ public:
      * @return
      */
     template<typename T,
-            std::enable_if_t<std::is_base_of<CObject, T>::value, int> = 0>
+            enable_if_t<std::is_base_of<CObject, T>::value, int> = 0>
     static T* safeMallocCObject() {
         T* ptr = nullptr;
         while (!ptr) {
@@ -47,9 +47,9 @@ public:
      * @return
      */
     template<typename T,
-            std::enable_if_t<std::is_base_of<CObject, T>::value, int> = 0>
+            enable_if_t<std::is_base_of<CObject, T>::value, int> = 0>
     static std::unique_ptr<T> makeUniqueCObject() {
-        return std::make_unique<T>();
+        return make_unique<T>();
     }
 
 

src/UtilsCtrl/UMemory.h

@@ -0,0 +1,59 @@
+/*
+ * @Author: chenjingyu
+ * @Date: 2022-10-11 01:43:58
+ * @LastEditTime: 2022-10-11 02:32:15
+ * @Description: Memory operator
+ * @FilePath: /CThreadPool/src/UtilsCtrl/UMemory.h
+ */
+#ifndef CGRAPH_UMEMORY_H
+#define CGRAPH_UMEMORY_H
+
+#include <memory>
+#include <type_traits>
+#include "../CBasic/CBasicInclude.h"
+
+CGRAPH_NAMESPACE_BEGIN
+
+template <bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template <typename T>
+std::unique_ptr<T> WrapUnique(T* ptr) {
+  static_assert(!std::is_array<T>::value, "array types are unsupported");
+  static_assert(std::is_object<T>::value, "non-object types are unsupported");
+  return std::unique_ptr<T>(ptr);
+}
+
+// Traits to select proper overload and return type for `absl::make_unique<>`.
+template <typename T>
+struct MakeUniqueResult {
+  using scalar = std::unique_ptr<T>;
+};
+template <typename T>
+struct MakeUniqueResult<T[]> {
+  using array = std::unique_ptr<T[]>;
+};
+template <typename T, size_t N>
+struct MakeUniqueResult<T[N]> {
+  using invalid = void;
+};
+
+template <typename T, typename... Args>
+typename MakeUniqueResult<T>::scalar make_unique(
+  Args&&... args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+template <typename T>
+typename MakeUniqueResult<T>::array make_unique(size_t n) {
+  return std::unique_ptr<T>(new typename std::remove_extent<T>[n]());
+}
+
+template <typename T, typename... Args>
+typename MakeUniqueResult<T>::invalid make_unique(
+    Args&&... /* args */) = delete;
+
+CGRAPH_NAMESPACE_END
+
+
+#endif // CGRAPH_UMEMORY_H

tutorial.cpp

@@ -7,6 +7,7 @@
 ***************************/
 
 #include "src/CThreadPool.h"
+#include "src/UtilsCtrl/UMemory.h"
 
 #include "MyFunction.h"
 
@@ -123,7 +124,7 @@ void tutorial_threadpool_3(UThreadPoolPtr tp) {
 
 
 int main() {
-    auto pool = std::make_unique<UThreadPool>();    // 构造一个线程池类的智能指针
+    auto pool = make_unique<UThreadPool>();    // 构造一个线程池类的智能指针
     CGRAPH_ECHO("======== tutorial_threadpool_1 begin. ========");
     tutorial_threadpool_1(pool.get());