Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

netlist/plib: Fixed detection of clang versions with noexcept issue, added feature constants for C++ standard library version.

Browse Source
This commit is contained in:
Vas Crabb 2022-05-21 15:39:18 +10:00
parent 753756988d
commit c60cc01dbc
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/netlist/plib/pmatrix2d.h
View File

@ -163,7 +163,7 @@ namespace plib
pmatrix2d_vrl(const pmatrix2d_vrl &) = default; pmatrix2d_vrl(const pmatrix2d_vrl &) = default;
pmatrix2d_vrl &operator=(const pmatrix2d_vrl &) = default; pmatrix2d_vrl &operator=(const pmatrix2d_vrl &) = default;
pmatrix2d_vrl(pmatrix2d_vrl &&) noexcept = default; pmatrix2d_vrl(pmatrix2d_vrl &&) noexcept = default;
pmatrix2d_vrl &operator=(pmatrix2d_vrl &&) noexcept(!compile_info::clang_apple_noexcept_issue::value) = default; pmatrix2d_vrl &operator=(pmatrix2d_vrl &&) noexcept(!compile_info::clang_noexcept_issue::value) = default;
~pmatrix2d_vrl() = default; ~pmatrix2d_vrl() = default;

21
src/lib/netlist/plib/ptypes.h
View File

@ -85,6 +85,13 @@ namespace plib
NVCC NVCC
}; };
enum class ci_cpp_stdlib
{
UNKNOWN,
LIBSTDCXX,
LIBCPP
};
enum class ci_os enum class ci_os
{ {
UNKNOWN, UNKNOWN,
@ -153,6 +160,16 @@ namespace plib
using type = std::integral_constant<ci_compiler, ci_compiler::UNKNOWN>; using type = std::integral_constant<ci_compiler, ci_compiler::UNKNOWN>;
using version = std::integral_constant<int, 0>; using version = std::integral_constant<int, 0>;
#endif #endif
#if defined(_LIBCPP_VERSION)
using cpp_stdlib = std::integral_constant<ci_cpp_stdlib, ci_cpp_stdlib::LIBCPP>;
using cpp_stdlib_version = std::integral_constant<int, ((_LIBCPP_VERSION) / 1000) * 100 + ((_LIBCPP_VERSION) / 100) % 10>;
#elif defined(__GLIBCXX__)
using cpp_stdlib = std::integral_constant<ci_cpp_stdlib, ci_cpp_stdlib::LIBSTDCXX>;
using cpp_stdlib_version = std::integral_constant<int, (_GLIBCXX_RELEASE) * 100>;
#else
using cpp_stdlib = std::integral_constant<ci_cpp_stdlib, ci_cpp_stdlib::UNKNOWN>;
using cpp_stdlib_version = std::integral_constant<int, 0>;
#endif
#ifdef __unix__ #ifdef __unix__
using is_unix = std::integral_constant<bool, true>; using is_unix = std::integral_constant<bool, true>;
#else #else
@ -195,9 +212,9 @@ namespace plib
using mingw = std::integral_constant<bool, false>; using mingw = std::integral_constant<bool, false>;
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
using clang_apple_noexcept_issue = std::integral_constant<bool, version::value < 1100>; using clang_noexcept_issue = std::integral_constant<bool, version::value < 1100>;
#else #else
using clang_apple_noexcept_issue = std::integral_constant<bool, false>; using clang_noexcept_issue = std::integral_constant<bool, (type::value == ci_compiler::CLANG) && (version::value < 800)>;
#endif #endif
#if defined(__ia64__) #if defined(__ia64__)
using abi_vtable_function_descriptors = std::integral_constant<bool, true>; using abi_vtable_function_descriptors = std::integral_constant<bool, true>;