[Scummvm-git-logs] scummvm master -> 3b63afef6bc3e5a22ae86b6146076d22218c8dea

[grisenti]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3b63afef6b HPL1: disable c++11 features for angelscript


Commit: 3b63afef6bc3e5a22ae86b6146076d22218c8dea
    https://github.com/scummvm/scummvm/commit/3b63afef6bc3e5a22ae86b6146076d22218c8dea
Author: grisenti (emanuele at grisenti.net)
Date: 2022-12-27T09:49:26+01:00

Commit Message:
HPL1: disable c++11 features for angelscript

prevents the use of the type_traits header, missing on some platforms

Changed paths:
    engines/hpl1/engine/libraries/angelscript/angelscript.h


diff --git a/engines/hpl1/engine/libraries/angelscript/angelscript.h b/engines/hpl1/engine/libraries/angelscript/angelscript.h
index 78ced927715..551269fb1fa 100644
--- a/engines/hpl1/engine/libraries/angelscript/angelscript.h
+++ b/engines/hpl1/engine/libraries/angelscript/angelscript.h
@@ -393,6 +393,7 @@ typedef asIScriptContext *(*asREQUESTCONTEXTFUNC_t)(asIScriptEngine *, void *);
 typedef void (*asRETURNCONTEXTFUNC_t)(asIScriptEngine *, asIScriptContext *, void *);
 typedef void (*asCIRCULARREFFUNC_t)(asITypeInfo *, const void *, void *);
 
+#if 0 // diasbled for compatibility
 // Check if the compiler can use C++11 features
 #if !defined(_MSC_VER) || _MSC_VER >= 1700   // MSVC 2012
 #if !defined(__GNUC__) || defined(__clang__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)  // gnuc 4.7 or clang
@@ -403,6 +404,7 @@ typedef void (*asCIRCULARREFFUNC_t)(asITypeInfo *, const void *, void *);
 #endif
 #endif
 #endif
+#endif
 
 // This macro does basically the same thing as offsetof defined in stddef.h, but
 // GNUC should not complain about the usage as I'm not using 0 as the base pointer.