From b4d9682f219ca22a583b32045cb564e067aa0ea5 Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 3 May 2025 13:25:16 +0200 Subject: [PATCH] Codechange: use std::string_view for sq_throwerror --- src/3rdparty/squirrel/include/squirrel.h | 3 +-- src/3rdparty/squirrel/squirrel/sqapi.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/squirrel/include/squirrel.h b/src/3rdparty/squirrel/include/squirrel.h index 9f53f2f577..075f1d3793 100644 --- a/src/3rdparty/squirrel/include/squirrel.h +++ b/src/3rdparty/squirrel/include/squirrel.h @@ -306,8 +306,7 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror, SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror); const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx); const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval); -SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len = -1); -inline SQRESULT sq_throwerror(HSQUIRRELVM v, std::string_view err) { return sq_throwerror(v, err.data(), err.size()); } +SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view err); void sq_reseterror(HSQUIRRELVM v); void sq_getlasterror(HSQUIRRELVM v); diff --git a/src/3rdparty/squirrel/squirrel/sqapi.cpp b/src/3rdparty/squirrel/squirrel/sqapi.cpp index 2ccba36fad..416e806082 100644 --- a/src/3rdparty/squirrel/squirrel/sqapi.cpp +++ b/src/3rdparty/squirrel/squirrel/sqapi.cpp @@ -930,9 +930,9 @@ void sq_resetobject(HSQOBJECT *po) po->_unVal.pUserPointer=nullptr;po->_type=OT_NULL; } -SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len) +SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view error) { - v->_lasterror=SQString::Create(_ss(v),err, len); + v->_lasterror=SQString::Create(_ss(v),error); return -1; }