Update class non-type parameters (#7)

unterumarmung · Jul 2, 2021 · 4713d09 · 4713d09
1 parent 502a494
commit 4713d09
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,18 +9,18 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - { os: macos-10.15, xcode: "12.0.1" } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
+          - { os: macos-10.15 }
         build: [Debug, Release]
 
-    name: "xcode${{matrix.config.xcode}}:${{matrix.build}}"
+    name: "${{matrix.config.os}}:${{matrix.build}}"
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Configure CMake
-      run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build}}
+      - name: Configure CMake
+        run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build}}
 
-    - name: Build
-      run: cmake --build . --config ${{matrix.build}}
+      - name: Build
+        run: cmake --build . --config ${{matrix.build}}
 
-    - name: Tests
-      run: ctest --output-on-failure -C ${{matrix.build}}
+      - name: Tests
+        run: ctest --output-on-failure -C ${{matrix.build}}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -10,12 +10,11 @@ jobs:
       matrix:
         build: [Debug, Release]
         compiler:
-        - { cc: "gcc-8", cxx: "g++-8" }
         - { cc: "gcc-9", cxx: "g++-9" }
         - { cc: "gcc-10", cxx: "g++-10" }
-        - { cc: "clang-8", cxx: "clang++-8" }
-        - { cc: "clang-9", cxx: "clang++-9" }
         - { cc: "clang-10", cxx: "clang++-10" }
+        - { cc: "clang-11", cxx: "clang++-11" }
+        - { cc: "clang-12", cxx: "clang++-12" }
 
     name: "${{matrix.compiler.cxx}}:${{matrix.build}}"
     steps:

diff --git a/README.md b/README.md
@@ -66,4 +66,4 @@ If you are using Conan on your project for external dependencies, then you can u
 * ICC >= 19.0.1
 * MSVC >= 14.28 / Visual Studio 2019 (I don't have access to older VS versions right now, so it can work on older versions too)
 
-**Using `basic_fixed_string` as class non-type template parameter full available in GCC >= 10**
+**Using `basic_fixed_string` as class non-type template parameter full available in GCC >= 10 and VS 2019 16.9 or newer**
diff --git a/include/fixed_string.hpp b/include/fixed_string.hpp
@@ -32,7 +32,7 @@
 
 #define FIXSTR_VERSION_MAJOR 0
 #define FIXSTR_VERSION_MINOR 1
-#define FIXSTR_VERSION_PATCH 0
+#define FIXSTR_VERSION_PATCH 1
 
 #define FIXSTR_CPP20_CHAR8T_PRESENT __cpp_char8_t
 #define FIXSTR_CPP20_SPACESHIP_OPERATOR_PRESENT __cpp_lib_three_way_comparison
@@ -54,6 +54,8 @@
 #define FIXSTR_CPP20_CNTTP_PRESENT 1
 #elif __cpp_nontype_template_args >= 201911
 #define FIXSTR_CPP20_CNTTP_PRESENT 1
+#elif __cpp_nontype_template_parameter_class >= 201806
+#define FIXSTR_CPP20_CNTTP_PRESENT 1
 #else
 // Other compilers do not support cNTTP just yet
 #define FIXSTR_CPP20_CNTTP_PRESENT 0