diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/emu.h | 2 | ||||
-rw-r--r-- | src/lib/util/strformat.h | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/emu/emu.h b/src/emu/emu.h index afea75e477f..0cf7b7c1384 100644 --- a/src/emu/emu.h +++ b/src/emu/emu.h @@ -25,8 +25,6 @@ #include <unordered_map> #include <unordered_set> -#include "compat_cpp14.h" - // core emulator headers -- must be first #include "emucore.h" #include "eminline.h" diff --git a/src/lib/util/strformat.h b/src/lib/util/strformat.h index 51d521fd25b..dc8061ca944 100644 --- a/src/lib/util/strformat.h +++ b/src/lib/util/strformat.h @@ -185,6 +185,21 @@ #include <type_traits> #include <utility> +#if defined(__GNUC__) && ((__GNUC__ == 5 && __GNUC_MINOR__ < 2) || (__GNUC__ == 4 && __GNUC_MINOR__ > 8)) +namespace std +{ +template<class _Container> + inline constexpr auto + cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont)) + { return std::begin(__cont); } + +template<class _Container> + inline constexpr auto + cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont)) + { return std::end(__cont); } +} +#endif + namespace util { namespace detail { //************************************************************************** |