Skip to content

Commit 7c35d84

Browse files
committed
UPD | windows workflow #6
1 parent 8ee00a5 commit 7c35d84

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/conan_build_and_test_win.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ jobs:
3232
c_compiler: msvc
3333
cpp_compiler: msvc
3434
library_type: SHARED
35+
build_type: Debug
3536
- os: windows-latest
3637
c_compiler: msvc
3738
cpp_compiler: msvc
3839
library_type: STATIC
40+
build_type: Debug
3941

4042
steps:
4143
- uses: actions/checkout@v4
@@ -54,7 +56,7 @@ jobs:
5456
uses: actions/cache@v4
5557
with:
5658
path: C:\Users\runneradmin\.conan2
57-
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.library_type }}
59+
key: conan-${{ runner.os }}-${{ matrix.c_compiler }}-${{ matrix.build_type }}-${{ matrix.library_type }}
5860

5961
- if: ${{ (matrix.os == 'ubuntu-latest' && steps.cache-conan-ubuntu.outputs.cache-hit != 'true') || (matrix.os == 'windows-latest' && steps.cache-conan-windows.outputs.cache-hit != 'true') }}
6062
name: Create default Conan profile

include/std/ManapiCancellation.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace manapi::async {
3535
*
3636
* @return self
3737
*/
38-
cancellation_action &operator=(nullptr_t);
38+
cancellation_action &operator=(std::nullptr_t);
3939

4040
/**
4141
* Reuse of the cancellation object

src/std/ManapiCancellation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct manapi::async::cancellation_action::data_t {
2020
cancellation_action *parent;
2121
};
2222

23-
manapi::async::cancellation_action::cancellation_action(nullptr_t) {
23+
manapi::async::cancellation_action::cancellation_action(std::nullptr_t) {
2424
this->data = nullptr;
2525
}
2626

0 commit comments

Comments
 (0)