From f191d038ec1fa110e06374ff79e345c91b3365d7 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 15 Nov 2020 03:57:08 +1100 Subject: Minimal changes to sol2 and bgfx to compile as C++17. These changes should be sent upstream as pull requests. --- 3rdparty/bgfx/src/renderer_d3d12.h | 2 +- 3rdparty/sol2/sol/sol.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/bgfx/src/renderer_d3d12.h b/3rdparty/bgfx/src/renderer_d3d12.h index aee806db3ca..f1df3c6fb24 100644 --- a/3rdparty/bgfx/src/renderer_d3d12.h +++ b/3rdparty/bgfx/src/renderer_d3d12.h @@ -21,7 +21,7 @@ #if defined(__MINGW32__) // BK - temp workaround for MinGW until I nuke d3dx12 usage. extern "C++" { __extension__ template - const GUID& __mingw_uuidof(); + constexpr const GUID& __mingw_uuidof(); template<> const GUID& __mingw_uuidof() diff --git a/3rdparty/sol2/sol/sol.hpp b/3rdparty/sol2/sol/sol.hpp index 4ef5807fdcb..9e0b5f85338 100644 --- a/3rdparty/sol2/sol/sol.hpp +++ b/3rdparty/sol2/sol/sol.hpp @@ -4533,7 +4533,7 @@ namespace sol { class bad_optional_access : public std::exception { public: bad_optional_access() = default; - const char* what() const noexcept { + const char* what() const noexcept override { return "Optional has no value"; } }; -- cgit v1.2.3