Skip to content

Commit 646e3da

Browse files
committed
ok macos finally uses appleclang >= 14 [skip appveyor][mac only]
1 parent 249e915 commit 646e3da

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

.github/workflows/LinuxHeadless_build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
build:
19-
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[lin only]') && !contains(github.event.head_commit.message, '[win only]')"
19+
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[lin only]') && !contains(github.event.head_commit.message, '[win only]') && !contains(github.event.head_commit.message, '[mac only]')"
2020
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
2121
# You can convert this to a matrix build if you need cross-platform coverage.
2222
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix

.github/workflows/Linux_build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
build:
19-
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[ds only]') && !contains(github.event.head_commit.message, '[win only]')"
19+
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[ds only]') && !contains(github.event.head_commit.message, '[win only]') && !contains(github.event.head_commit.message, '[mac only]')"
2020
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
2121
# You can convert this to a matrix build if you need cross-platform coverage.
2222
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix

src/augs/misc/date_time.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,12 @@ augs::date_time::date_time(
4141
}
4242

4343
#if defined(__clang__) && defined(PLATFORM_UNIX)
44-
#if PLATFORM_MACOS
45-
// To be removed once macos updates to AppleClang 14
46-
augs::date_time::date_time(
47-
const augs::file_time_type& tp
48-
) :
49-
date_time(augs::file_time_type::clock::to_time_t(tp))
50-
{
51-
}
52-
#else
5344
augs::date_time::date_time(
5445
const augs::file_time_type& tp
5546
) :
5647
date_time(std::chrono::time_point_cast<std::chrono::system_clock::duration>(std::chrono::file_clock::to_sys(tp)))
5748
{
5849
}
59-
#endif
6050
#else
6151

6252
static time_t filetime_to_timet(FILETIME const& ft) {

0 commit comments

Comments
 (0)