From a76283053fa06df7d0f0c0d82b0067e37f1a29d8 Mon Sep 17 00:00:00 2001 From: Patrix Date: Fri, 7 Apr 2023 00:02:33 +0200 Subject: [PATCH] Updated sqrat dependency to 3.2 squirrel version --- dependencies/sqrat/include/sqmodule.h | 4 ++-- dependencies/sqrat/include/sqrat/sqratClassType.h | 2 +- dependencies/sqrat/include/sqrat/sqratFunction.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies/sqrat/include/sqmodule.h b/dependencies/sqrat/include/sqmodule.h index 4633432..696df61 100644 --- a/dependencies/sqrat/include/sqmodule.h +++ b/dependencies/sqrat/include/sqmodule.h @@ -113,10 +113,10 @@ extern "C" { SQRESULT (*gettypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag); void (*setreleasehook)(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook); SQChar* (*getscratchpad)(HSQUIRRELVM v,SQInteger minsize); - SQRESULT (*getclosureinfo)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars); + SQRESULT (*getclosureinfo)(HSQUIRRELVM v,SQInteger idx,SQInteger *nparams,SQInteger *nfreevars); SQRESULT (*setnativeclosurename)(HSQUIRRELVM v,SQInteger idx,const SQChar *name); SQRESULT (*setinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer p); - SQRESULT (*getinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag); + SQRESULT (*getinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag, SQBool throwerror); SQRESULT (*setclassudsize)(HSQUIRRELVM v, SQInteger idx, SQInteger udsize); SQRESULT (*newclass)(HSQUIRRELVM v,SQBool hasbase); SQRESULT (*createinstance)(HSQUIRRELVM v,SQInteger idx); diff --git a/dependencies/sqrat/include/sqrat/sqratClassType.h b/dependencies/sqrat/include/sqrat/sqratClassType.h index 28e7f2c..82b83d1 100644 --- a/dependencies/sqrat/include/sqrat/sqratClassType.h +++ b/dependencies/sqrat/include/sqrat/sqratClassType.h @@ -216,7 +216,7 @@ public: classType = getStaticClassData().Lock().Get(); #if !defined (SCRAT_NO_ERROR_CHECKING) - if (SQ_FAILED(sq_getinstanceup(vm, idx, (SQUserPointer*)&instance, classType))) { + if (SQ_FAILED(sq_getinstanceup(vm, idx, (SQUserPointer*)&instance, classType, SQTrue))) { SQTHROW(vm, FormatTypeError(vm, idx, ClassName())); return NULL; } diff --git a/dependencies/sqrat/include/sqrat/sqratFunction.h b/dependencies/sqrat/include/sqrat/sqratFunction.h index f2e69b6..cf76c63 100644 --- a/dependencies/sqrat/include/sqrat/sqratFunction.h +++ b/dependencies/sqrat/include/sqrat/sqratFunction.h @@ -1279,8 +1279,8 @@ public: sq_pushobject(vm, env); #if !defined (SCRAT_NO_ERROR_CHECKING) - SQUnsignedInteger nparams; - SQUnsignedInteger nfreevars; + SQInteger nparams; + SQInteger nfreevars; if (obj._type != OT_NATIVECLOSURE && SQ_SUCCEEDED(sq_getclosureinfo(vm, -2, &nparams, &nfreevars)) && (nparams != 1)) { sq_pop(vm, 2);