Skip to content

Commit 4713d09

Browse files
Update class non-type parameters (#7)
1 parent 502a494 commit 4713d09

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

.github/workflows/macos.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
config:
12-
- { os: macos-10.15, xcode: "12.0.1" } # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.md#xcode
12+
- { os: macos-10.15 }
1313
build: [Debug, Release]
1414

15-
name: "xcode${{matrix.config.xcode}}:${{matrix.build}}"
15+
name: "${{matrix.config.os}}:${{matrix.build}}"
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v2
1818

19-
- name: Configure CMake
20-
run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build}}
19+
- name: Configure CMake
20+
run: cmake -DCMAKE_BUILD_TYPE=${{matrix.build}}
2121

22-
- name: Build
23-
run: cmake --build . --config ${{matrix.build}}
22+
- name: Build
23+
run: cmake --build . --config ${{matrix.build}}
2424

25-
- name: Tests
26-
run: ctest --output-on-failure -C ${{matrix.build}}
25+
- name: Tests
26+
run: ctest --output-on-failure -C ${{matrix.build}}

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ jobs:
1010
matrix:
1111
build: [Debug, Release]
1212
compiler:
13-
- { cc: "gcc-8", cxx: "g++-8" }
1413
- { cc: "gcc-9", cxx: "g++-9" }
1514
- { cc: "gcc-10", cxx: "g++-10" }
16-
- { cc: "clang-8", cxx: "clang++-8" }
17-
- { cc: "clang-9", cxx: "clang++-9" }
1815
- { cc: "clang-10", cxx: "clang++-10" }
16+
- { cc: "clang-11", cxx: "clang++-11" }
17+
- { cc: "clang-12", cxx: "clang++-12" }
1918

2019
name: "${{matrix.compiler.cxx}}:${{matrix.build}}"
2120
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ If you are using Conan on your project for external dependencies, then you can u
6666
* ICC >= 19.0.1
6767
* 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)
6868

69-
**Using `basic_fixed_string` as class non-type template parameter full available in GCC >= 10**
69+
**Using `basic_fixed_string` as class non-type template parameter full available in GCC >= 10 and VS 2019 16.9 or newer**

include/fixed_string.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define FIXSTR_VERSION_MAJOR 0
3434
#define FIXSTR_VERSION_MINOR 1
35-
#define FIXSTR_VERSION_PATCH 0
35+
#define FIXSTR_VERSION_PATCH 1
3636

3737
#define FIXSTR_CPP20_CHAR8T_PRESENT __cpp_char8_t
3838
#define FIXSTR_CPP20_SPACESHIP_OPERATOR_PRESENT __cpp_lib_three_way_comparison
@@ -54,6 +54,8 @@
5454
#define FIXSTR_CPP20_CNTTP_PRESENT 1
5555
#elif __cpp_nontype_template_args >= 201911
5656
#define FIXSTR_CPP20_CNTTP_PRESENT 1
57+
#elif __cpp_nontype_template_parameter_class >= 201806
58+
#define FIXSTR_CPP20_CNTTP_PRESENT 1
5759
#else
5860
// Other compilers do not support cNTTP just yet
5961
#define FIXSTR_CPP20_CNTTP_PRESENT 0

0 commit comments

Comments
 (0)