diff --git a/code/AssetLib/glTF/glTFImporter.cpp b/code/AssetLib/glTF/glTFImporter.cpp index 406b0b53a..46b8a3be4 100644 --- a/code/AssetLib/glTF/glTFImporter.cpp +++ b/code/AssetLib/glTF/glTFImporter.cpp @@ -658,6 +658,7 @@ void glTFImporter::ImportEmbeddedTextures(glTF::Asset &r) { if (strncmp(ext, "jpeg", 4) == 0) { ext = "jpg"; } + tex->achFormatHint[3] = '\0'; size_t len = strlen(ext); if (len > 3) len = 3; diff --git a/code/Common/Maybe.h b/code/Common/Maybe.h index 99b18b67c..3d073fc63 100644 --- a/code/Common/Maybe.h +++ b/code/Common/Maybe.h @@ -83,6 +83,7 @@ struct Maybe { Maybe &operator&() = delete; Maybe(const Maybe &) = delete; + Maybe &operator=(const Maybe &) = default; private: T _val; diff --git a/contrib/clipper/clipper.cpp b/contrib/clipper/clipper.cpp index f7a74ed3a..69f616c8b 100644 --- a/contrib/clipper/clipper.cpp +++ b/contrib/clipper/clipper.cpp @@ -264,7 +264,14 @@ class Int128 Int128(const Int128 &val): lo(val.lo), hi(val.hi){} Int128(const long64& _hi, const ulong64& _lo): lo(_lo), hi(_hi){} - + + Int128& operator = (const Int128 &val) + { + lo = val.lo; + hi = val.hi; + return *this; + } + Int128& operator = (const long64 &val) { lo = (ulong64)val; diff --git a/contrib/openddlparser/code/OpenDDLParser.cpp b/contrib/openddlparser/code/OpenDDLParser.cpp index 75a7a223e..60fddc8be 100644 --- a/contrib/openddlparser/code/OpenDDLParser.cpp +++ b/contrib/openddlparser/code/OpenDDLParser.cpp @@ -149,7 +149,7 @@ void OpenDDLParser::logToStream(FILE *f, LogSeverity severity, const std::string OpenDDLParser::logCallback OpenDDLParser::StdLogCallback (FILE *destination) { using namespace std::placeholders; - return std::bind(logToStream, destination ? destination : stderr, _1, _2); + return [capture0 = destination ? destination : stderr](auto && PH1, auto && PH2) { logToStream(capture0, std::forward(PH1), std::forward(PH2)); }; } void OpenDDLParser::setLogCallback(logCallback callback) {