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

attempt to silence warnings about array usage and keep a definition check for nil

Browse Source 
add some "max size" checks in other places.
This commit is contained in:
ThePhD 2017-09-21 21:32:52 -04:00
parent 61d610bb70
commit 1b23ad8b4f
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
single/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2017-09-21 23:23:58.410071 UTC // Generated 2017-09-22 01:32:30.111717 UTC
// This header was generated with sol v2.18.3 (revision 76d7195) // This header was generated with sol v2.18.2 (revision 61d610b)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -4921,9 +4921,9 @@ namespace sol {
enum class type : int { enum class type : int {
none = LUA_TNONE, none = LUA_TNONE,
lua_nil = LUA_TNIL, lua_nil = LUA_TNIL,
#ifndef __OBJC__ #if !defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || !defined(__OBJC__) || !defined(nil)
nil = lua_nil, nil = lua_nil,
#endif // Objective C++ Keyword #endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
string = LUA_TSTRING, string = LUA_TSTRING,
number = LUA_TNUMBER, number = LUA_TNUMBER,
thread = LUA_TTHREAD, thread = LUA_TTHREAD,
@ -7672,7 +7672,7 @@ namespace stack {
tracking.use(1); tracking.use(1);
int index = lua_absindex(L, relindex); int index = lua_absindex(L, relindex);
T arr{}; T arr;
std::size_t idx = 0; std::size_t idx = 0;
#if SOL_LUA_VERSION >= 503 #if SOL_LUA_VERSION >= 503
// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3 // This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
@ -7700,6 +7700,9 @@ namespace stack {
#else #else
// Zzzz slower but necessary thanks to the lower version API and missing functions qq // Zzzz slower but necessary thanks to the lower version API and missing functions qq
for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) { for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
if (idx >= arr.max_size()) {
return arr;
}
bool isnil = false; bool isnil = false;
for (int vi = 0; vi < lua_size<V>::value; ++vi) { for (int vi = 0; vi < lua_size<V>::value; ++vi) {
lua_pushinteger(L, i); lua_pushinteger(L, i);
@ -7804,6 +7807,9 @@ namespace stack {
#else #else
// Zzzz slower but necessary thanks to the lower version API and missing functions qq // Zzzz slower but necessary thanks to the lower version API and missing functions qq
for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) { for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
if (idx >= arr.max_size()) {
return arr;
}
bool isnil = false; bool isnil = false;
for (int vi = 0; vi < lua_size<V>::value; ++vi) { for (int vi = 0; vi < lua_size<V>::value; ++vi) {
lua_pushinteger(L, i); lua_pushinteger(L, i);

8
sol/stack_get.hpp
View File

@ -119,7 +119,7 @@ namespace stack {
tracking.use(1); tracking.use(1);
int index = lua_absindex(L, relindex); int index = lua_absindex(L, relindex);
T arr{}; T arr;
std::size_t idx = 0; std::size_t idx = 0;
#if SOL_LUA_VERSION >= 503 #if SOL_LUA_VERSION >= 503
// This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3 // This method is HIGHLY performant over regular table iteration thanks to the Lua API changes in 5.3
@ -147,6 +147,9 @@ namespace stack {
#else #else
// Zzzz slower but necessary thanks to the lower version API and missing functions qq // Zzzz slower but necessary thanks to the lower version API and missing functions qq
for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) { for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
if (idx >= arr.max_size()) {
return arr;
}
bool isnil = false; bool isnil = false;
for (int vi = 0; vi < lua_size<V>::value; ++vi) { for (int vi = 0; vi < lua_size<V>::value; ++vi) {
lua_pushinteger(L, i); lua_pushinteger(L, i);
@ -251,6 +254,9 @@ namespace stack {
#else #else
// Zzzz slower but necessary thanks to the lower version API and missing functions qq // Zzzz slower but necessary thanks to the lower version API and missing functions qq
for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) { for (lua_Integer i = 0;; i += lua_size<V>::value, lua_pop(L, lua_size<V>::value)) {
if (idx >= arr.max_size()) {
return arr;
}
bool isnil = false; bool isnil = false;
for (int vi = 0; vi < lua_size<V>::value; ++vi) { for (int vi = 0; vi < lua_size<V>::value; ++vi) {
lua_pushinteger(L, i); lua_pushinteger(L, i);

4
sol/types.hpp
View File

@ -587,9 +587,9 @@ namespace sol {
enum class type : int { enum class type : int {
none = LUA_TNONE, none = LUA_TNONE,
lua_nil = LUA_TNIL, lua_nil = LUA_TNIL,
#ifndef __OBJC__ #if !defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || !defined(__OBJC__) || !defined(nil)
nil = lua_nil, nil = lua_nil,
#endif // Objective C++ Keyword #endif // Objective C/C++ Keyword that's found in OSX SDK and OBJC -- check for all forms to protect
string = LUA_TSTRING, string = LUA_TSTRING,
number = LUA_TNUMBER, number = LUA_TNUMBER,
thread = LUA_TTHREAD, thread = LUA_TTHREAD,