StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #701 from isvogor-foi/develop

Browse Source 
fmt rename to fmt_ to avoid naming conflict with the spdlog library
This commit is contained in:
The Phantom Derpstorm 2018-09-03 09:40:02 -04:00 committed by GitHub
commit 4f974a7424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
single/sol/sol.hpp
View File

@ -16571,25 +16571,25 @@ namespace sol {
struct error_result { struct error_result {
int results; int results;
const char* fmt; const char* fmt_;
std::array<const char*, 4> args; std::array<const char*, 4> args;
error_result() : results(0), fmt(nullptr) { error_result() : results(0), fmt_(nullptr) {
} }
error_result(int results) : results(results), fmt(nullptr) { error_result(int results) : results(results), fmt_(nullptr) {
} }
error_result(const char* fmt, const char* msg) : results(0), fmt(fmt) { error_result(const char* fmt_, const char* msg) : results(0), fmt_(fmt_) {
args[0] = msg; args[0] = msg;
} }
}; };
inline int handle_errors(lua_State* L, const error_result& er) { inline int handle_errors(lua_State* L, const error_result& er) {
if (er.fmt == nullptr) { if (er.fmt_ == nullptr) {
return er.results; return er.results;
} }
return luaL_error(L, er.fmt, er.args[0], er.args[1], er.args[2], er.args[3]); return luaL_error(L, er.fmt_, er.args[0], er.args[1], er.args[2], er.args[3]);
} }
template <typename X, typename = void> template <typename X, typename = void>

12
sol/container_traits.hpp
View File

@ -456,25 +456,25 @@ namespace sol {
struct error_result { struct error_result {
int results; int results;
const char* fmt; const char* fmt_;
std::array<const char*, 4> args; std::array<const char*, 4> args;
error_result() : results(0), fmt(nullptr) { error_result() : results(0), fmt_(nullptr) {
} }
error_result(int results) : results(results), fmt(nullptr) { error_result(int results) : results(results), fmt_(nullptr) {
} }
error_result(const char* fmt, const char* msg) : results(0), fmt(fmt) { error_result(const char* fmt_, const char* msg) : results(0), fmt_(fmt_) {
args[0] = msg; args[0] = msg;
} }
}; };
inline int handle_errors(lua_State* L, const error_result& er) { inline int handle_errors(lua_State* L, const error_result& er) {
if (er.fmt == nullptr) { if (er.fmt_ == nullptr) {
return er.results; return er.results;
} }
return luaL_error(L, er.fmt, er.args[0], er.args[1], er.args[2], er.args[3]); return luaL_error(L, er.fmt_, er.args[0], er.args[1], er.args[2], er.args[3]);
} }
template <typename X, typename = void> template <typename X, typename = void>