test 13

Author: ChunelFeng

.github/workflows/cmake4win.yml

@@ -12,15 +12,19 @@ env:
 
 jobs:
   build:
+    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # You can convert this to a matrix build if you need cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: windows-latest
 
-    strategy:
-      matrix:
-        cpp_std: [ "11", "14", "17", "20" ]
-      fail-fast: false
-
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
-      - name: Build
-        run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

src/GraphCtrl/GraphParam/GParam.h

@@ -11,16 +11,14 @@
 
 #include <set>
 #include <mutex>
-#include <shared_mutex>
-#include <optional>
 
 #include "GParamObject.h"
 
 CGRAPH_NAMESPACE_BEGIN
 
 class GParam : public GParamObject {
 public:
-#if __cplusplus >= 201703L
+#if __cplusplus >= 201703L && _CGRAPH_GPARAM_RWLOCK_ENABLE_
     std::shared_mutex _param_shared_lock_;    // 用于参数互斥的锁信息
 #else
     std::recursive_mutex _param_shared_lock_;