diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index e3421c1d25..fab4e3bf5d 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -117,7 +117,14 @@ jobs: - name: Setup Environment run: | + brew update-reset + brew link --overwrite openssl@3 + brew cleanup + brew doctor + brew reinstall cask + brew update brew tap shivammathur/php + # because of https://github.com/andreylzmw/kphp/actions/runs/5443231564/jobs/9899501452 brew update brew install re2c cmake coreutils openssl libiconv re2 pcre yaml-cpp zstd googletest shivammathur/php/php@7.4 brew link --overwrite --force shivammathur/php/php@7.4 diff --git a/common/sanitizer.h b/common/sanitizer.h index 3795754372..25ec874ea4 100644 --- a/common/sanitizer.h +++ b/common/sanitizer.h @@ -4,13 +4,13 @@ #pragma once -#include - #if defined(__SANITIZE_ADDRESS__) # define ASAN_ENABLED 1 +# include #elif defined(__has_feature) # if __has_feature(address_sanitizer) # define ASAN_ENABLED 1 +# include # endif #endif @@ -19,11 +19,11 @@ #endif #if defined(__clang__) - #define ubsan_supp(x) __attribute__((no_sanitize(x))) +# define ubsan_supp(x) __attribute__((no_sanitize(x))) #else - #define ubsan_supp(x) __attribute__((no_sanitize_undefined)) +# define ubsan_supp(x) __attribute__((no_sanitize_undefined)) #endif #if !defined(USAN_ENABLED) # define USAN_ENABLED 0 -#endif +#endif \ No newline at end of file diff --git a/common/type_traits/is_copyable.h b/common/type_traits/is_copyable.h index d367a3b1a9..e606834e97 100644 --- a/common/type_traits/is_copyable.h +++ b/common/type_traits/is_copyable.h @@ -12,7 +12,7 @@ template struct is_trivially_copyable { #if __GNUG__ && __GNUC__ < 5 // works identically in common cases, but there are subtle differneces: https://stackoverflow.com/questions/12754886/has-trivial-copy-behaves-differently-in-clang-and-gcc-whos-right - static constexpr bool value = __has_trivial_copy(T); + static constexpr bool value = __is_trivially_copyable(T); #else static constexpr bool value = std::is_trivially_copyable::value; #endif