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

fix #826 #824

Browse Source
This commit is contained in:
ThePhD 2019-06-04 14:15:23 -04:00
parent cbb05759be
commit d63ba49b0e
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
4 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sol/stack_push.hpp
View File

@ -731,7 +731,7 @@ namespace sol {
struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> { struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) { static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
if constexpr (!std::is_same_v<Ch, char>) { if constexpr (!std::is_same_v<Ch, char>) {
return stack::push(str.data(), str.size()); return stack::push(L, str.data(), str.size());
} }
else { else {
#if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK #if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK
@ -744,7 +744,7 @@ namespace sol {
static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) { static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
if constexpr (!std::is_same_v<Ch, char>) { if constexpr (!std::is_same_v<Ch, char>) {
return stack::push(str.data(), sz); return stack::push(L, str.data(), sz);
} }
else { else {
#if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK #if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK

13
include/sol/usertype_storage.hpp
View File

@ -1027,7 +1027,20 @@ namespace sol { namespace u_detail {
// not destructible: serialize a // not destructible: serialize a
// "hey you messed up" // "hey you messed up"
// destructor // destructor
switch (smt) {
case submetatable_type::const_reference:
case submetatable_type::reference:
case submetatable_type::named:
break;
case submetatable_type::unique:
stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index()); stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
break;
case submetatable_type::value:
case submetatable_type::const_value:
default:
stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
break;
}
} }
static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function), static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),

4
single/include/sol/forward.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 2019-05-30 02:01:01.713986 UTC // Generated 2019-06-04 18:14:05.186483 UTC
// This header was generated with sol v3.0.2 (revision 3dd617d) // This header was generated with sol v3.0.2 (revision cbb0575)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

21
single/include/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 2019-05-30 02:01:01.136993 UTC // Generated 2019-06-04 18:14:04.496190 UTC
// This header was generated with sol v3.0.2 (revision 3dd617d) // This header was generated with sol v3.0.2 (revision cbb0575)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -13479,7 +13479,7 @@ namespace sol {
struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> { struct unqualified_pusher<std::basic_string<Ch, Traits, Al>> {
static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) { static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str) {
if constexpr (!std::is_same_v<Ch, char>) { if constexpr (!std::is_same_v<Ch, char>) {
return stack::push(str.data(), str.size()); return stack::push(L, str.data(), str.size());
} }
else { else {
#if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK #if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK
@ -13492,7 +13492,7 @@ namespace sol {
static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) { static int push(lua_State* L, const std::basic_string<Ch, Traits, Al>& str, std::size_t sz) {
if constexpr (!std::is_same_v<Ch, char>) { if constexpr (!std::is_same_v<Ch, char>) {
return stack::push(str.data(), sz); return stack::push(L, str.data(), sz);
} }
else { else {
#if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK #if defined(SOL_SAFE_STACK_CHECK) && SOL_SAFE_STACK_CHECK
@ -21741,7 +21741,20 @@ namespace sol { namespace u_detail {
// not destructible: serialize a // not destructible: serialize a
// "hey you messed up" // "hey you messed up"
// destructor // destructor
switch (smt) {
case submetatable_type::const_reference:
case submetatable_type::reference:
case submetatable_type::named:
break;
case submetatable_type::unique:
stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index()); stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
break;
case submetatable_type::value:
case submetatable_type::const_value:
default:
stack::set_field<false, true>(L, meta_function::garbage_collect, &detail::cannot_destruct<T>, t.stack_index());
break;
}
} }
static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function), static_assert(sizeof(void*) <= sizeof(detail::inheritance_check_function),