dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use of fmt from squtils.h

Browse Source 
Fixes link warning on MinGW
This commit is contained in:
Jonathan G Rennison
2023-08-01 00:40:48 +01:00
parent 748ff13a6d
commit f4d237e022
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/3rdparty/squirrel/squirrel/squtils.h vendored
View File

@@ -2,7 +2,7 @@
#ifndef _SQUTILS_H_ #ifndef _SQUTILS_H_
#define _SQUTILS_H_ #define _SQUTILS_H_
#include "../../../core/format.hpp" #include "../../../string_func.h"
#include "../../../script/script_fatalerror.hpp" #include "../../../script/script_fatalerror.hpp"
#include <type_traits> #include <type_traits>
@@ -108,8 +108,8 @@ private:
{ {
newsize = (newsize > 0)?newsize:4; newsize = (newsize > 0)?newsize:4;
if (newsize > SIZE_MAX / sizeof(T)) { if (newsize > SIZE_MAX / sizeof(T)) {
std::string msg = fmt::format("cannot resize to {}", newsize); std::string msg = stdstr_fmt("cannot resize to " PRINTF_SIZE, (size_t)newsize);
throw Script_FatalError(msg); throw Script_FatalError(std::move(msg));
} }
_vals = (T*)SQ_REALLOC(_vals, _allocated * sizeof(T), newsize * sizeof(T)); _vals = (T*)SQ_REALLOC(_vals, _allocated * sizeof(T), newsize * sizeof(T));
_allocated = (size_t)newsize; _allocated = (size_t)newsize;