summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-03-05 14:41:30 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-05 14:41:42 +0100
commit4a876eab0eaea8f68e9634976f9aaea53a7cd12f (patch)
tree2e14ec242e5fca812473c51712d03f36ed11d8d7 /src
parent63fb72684a5f011feb1c35b0829700aa79848495 (diff)
This works (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/emu.h2
-rw-r--r--src/lib/util/strformat.h15
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 {
//**************************************************************************