Skip to content

Fix llvm-mingw tests with LLVM trunk #1235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 2 commits into from
Nov 24, 2022
Merged

Fix llvm-mingw tests with LLVM trunk #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f67f941
cmake: Fix WindowsNumerics check
alvinhochun Nov 23, 2022
1221175
Guard cpp20 format and ranges tests behind feature test macros
alvinhochun Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function(TestHasWindowsnumerics OUTPUT_VARNAME)
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("
#define _WINDOWS_NUMERICS_NAMESPACE_ winrt::Windows::Foundation::Numerics
#define _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ WINRT_EXPORT namespace winrt::Windows::Foundation::Numerics
#define _WINDOWS_NUMERICS_BEGIN_NAMESPACE_ namespace winrt::Windows::Foundation::Numerics
#define _WINDOWS_NUMERICS_END_NAMESPACE_
#include <windowsnumerics.impl.h>
int main() {}
Expand Down
3 changes: 3 additions & 0 deletions test/test_cpp20/format.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "pch.h"

#ifdef __cpp_lib_format
#include <format>

struct stringable : winrt::implements<stringable, winrt::Windows::Foundation::IStringable>
Expand Down Expand Up @@ -37,3 +39,4 @@ TEST_CASE("format")
}
#endif
}
#endif
3 changes: 3 additions & 0 deletions test/test_cpp20/ranges.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "pch.h"

#ifdef __cpp_lib_ranges
#include <algorithm>
#include <ranges>

Expand Down Expand Up @@ -46,3 +48,4 @@ TEST_CASE("ranges")
REQUIRE((result == std::vector{ 2, 4, 6 }));
}
}
#endif