Skip to content

Commit a94b082

Browse files
committed
Remove xcode-11 from integration
Fix MSVC build
1 parent ab4bb56 commit a94b082

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/integrate.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
ubuntu-20.04-clang-11,
2525
windows-2016-msvc2017,
2626
windows-2019-msvc2019,
27-
macos-10.15-xcode-11,
2827
macos-10.15-xcode-11.4,
2928
macos-10.15-xcode-12,
3029
macos-11.0-x86_64,
@@ -77,11 +76,6 @@ jobs:
7776
compiler: cl
7877
version: "Visual Studio 16 2019"
7978

80-
- name: macOS-10.15-xcode-11
81-
os: macOS-10.15
82-
compiler: xcode
83-
version: "11"
84-
8579
- name: macOS-10.15-xcode-11.4
8680
os: macOS-10.15
8781
compiler: xcode

3rdparty/source_location.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
namespace nostd {
99
struct source_location {
1010
public:
11+
#ifdef MSVC
12+
static constexpr source_location current(const char* fileName = "unsupported",
13+
const char* functionName = "unsupported",
14+
const uint_least32_t lineNumber = 0,
15+
const uint_least32_t columnOffset = 0) noexcept
16+
#else
1117
#if defined(__clang__) and (__clang_major__ >= 9)
1218
static constexpr source_location current(const char* fileName = __builtin_FILE(),
1319
const char* functionName = __builtin_FUNCTION(),
@@ -23,6 +29,7 @@ struct source_location {
2329
const char* functionName = "unsupported",
2430
const uint_least32_t lineNumber = 0,
2531
const uint_least32_t columnOffset = 0) noexcept
32+
#endif
2633
#endif
2734
{
2835
return source_location(fileName, functionName, lineNumber, columnOffset);

0 commit comments

Comments
 (0)