diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2022-09-25 22:24:51 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2022-09-25 22:24:51 -0400 |
commit | a61cb4cb61c544241712dfb039817e7c7b72e3c0 (patch) | |
tree | 2550458998a8dfb6d00566ba337524f442f54dd2 | |
parent | 60a3acb9705b7296fca190914f4c88650ec33de1 (diff) |
mactoolbox.h: Move std::function template deduction guide to more accessible core header
-rw-r--r-- | src/emu/devdelegate.h | 8 | ||||
-rw-r--r-- | src/mame/apple/mactoolbox.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/emu/devdelegate.h b/src/emu/devdelegate.h index 69381b2576b..5f7af89383b 100644 --- a/src/emu/devdelegate.h +++ b/src/emu/devdelegate.h @@ -21,6 +21,14 @@ #include <utility> +// older versions of libc++ are missing deduction guides that the things using this constructor require +#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION < 10000) +namespace std { inline namespace __1 { +template<class R, class... ArgTypes > function( R(*)(ArgTypes...) ) -> function<R(ArgTypes...)>; +} } +#endif + + namespace emu { //************************************************************************** diff --git a/src/mame/apple/mactoolbox.h b/src/mame/apple/mactoolbox.h index 6f16ac60ce7..838f90a15eb 100644 --- a/src/mame/apple/mactoolbox.h +++ b/src/mame/apple/mactoolbox.h @@ -7,15 +7,6 @@ #pragma once -// older versions of libc++ are missing deduction guides that the things using this require -// FIXME: find a better place to put this -#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION < 10000) -namespace std { inline namespace __1 { -template<class R, class... ArgTypes > function( R(*)(ArgTypes...) ) -> function<R(ArgTypes...)>; -} } -#endif - - extern offs_t mac68k_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer ¶ms); #endif // MAME_APPLE_MACTOOLBOX_H |