summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-11-15 03:57:08 +1100
committer Vas Crabb <vas@vastheman.com>2020-11-15 03:57:08 +1100
commitf191d038ec1fa110e06374ff79e345c91b3365d7 (patch)
tree491410230c4efc26546f347cba8be0e8d9e79937
parent55b8ca317ab1f77850f498c1523355e1f5dd8d03 (diff)
Minimal changes to sol2 and bgfx to compile as C++17.
These changes should be sent upstream as pull requests.
-rw-r--r--3rdparty/bgfx/src/renderer_d3d12.h2
-rw-r--r--3rdparty/sol2/sol/sol.hpp2
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<typename Ty>
- const GUID& __mingw_uuidof();
+ constexpr const GUID& __mingw_uuidof();
template<>
const GUID& __mingw_uuidof<ID3D12Device>()
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";
}
};