mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::string_view for sq_throwerror

pull/14201/head
Rubidium 2025-05-03 13:25:16 +02:00 committed by rubidium42
parent ec79ceb2be
commit b4d9682f21
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdparty/squirrel/include/squirrel.h vendored
View File

@ -306,8 +306,7 @@ SQRESULT sq_call(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror,
SQRESULT sq_resume(HSQUIRRELVM v,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_getlocal(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval); const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
SQRESULT sq_throwerror(HSQUIRRELVM v,const SQChar *err, SQInteger len = -1); SQRESULT sq_throwerror(HSQUIRRELVM v,std::string_view err);
inline SQRESULT sq_throwerror(HSQUIRRELVM v, std::string_view err) { return sq_throwerror(v, err.data(), err.size()); }
void sq_reseterror(HSQUIRRELVM v); void sq_reseterror(HSQUIRRELVM v);
void sq_getlasterror(HSQUIRRELVM v); void sq_getlasterror(HSQUIRRELVM v);

4
src/3rdparty/squirrel/squirrel/sqapi.cpp vendored
View File

@ -930,9 +930,9 @@ void sq_resetobject(HSQOBJECT *po)
po->_unVal.pUserPointer=nullptr;po->_type=OT_NULL; 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; return -1;
} }