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 up the tutorial.

Browse Source
This commit is contained in:
ThePhD 2020-01-27 14:13:22 -05:00
parent 0c38fd1a57
commit 903f4db02b
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/tutorial/ownership.rst
View File

@ -34,7 +34,7 @@ Use/return a ``unique_ptr`` or ``shared_ptr`` instead or just return a value:
:linenos:
:caption: (smart pointers) pointer_lifetime.cpp
:name: pointer-lifetime-smart-ptr
:lines: 1-11,14-22, 74-
:lines: 1-11,25-44, 74-
If you have something you know is going to last and you just want to give it to Lua as a reference, then it's fine too:

4
examples/source/tutorials/pointer_lifetime.cpp
View File

@ -6,8 +6,8 @@ struct my_type {
}
};
int main () {
int main() {
sol::state lua;
/*

6
include/sol/stack_push.hpp
View File

@ -296,14 +296,14 @@ namespace sol { namespace stack {
lua_pushnumber(L, std::forward<Args>(args)...);
return 1;
}
else if constexpr (std::is_same<Tu, luaL_Stream*>) {
luaL_Stream* source(std::forward<Args>(args)...);
else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
luaL_Stream* source { std::forward<Args>(args)... };
luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
stream->f = source->f;
stream->closef = source->closef;
return 1;
}
else if constexpr (std::is_same<Tu, luaL_Stream>) {
else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
luaL_Stream& source(std::forward<Args>(args)...);
luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
stream->f = source.f;

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.
// This file was generated with a script.
// Generated 2020-01-25 17:11:21.688498 UTC
// This header was generated with sol v3.2.0 (revision 2beb13b)
// Generated 2020-01-27 19:13:11.283155 UTC
// This header was generated with sol v3.2.0 (revision 0c38fd1)
// https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

15
single/include/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script.
// Generated 2020-01-25 17:11:19.283779 UTC
// This header was generated with sol v3.2.0 (revision 2beb13b)
// Generated 2020-01-27 19:13:10.728559 UTC
// This header was generated with sol v3.2.0 (revision 0c38fd1)
// https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP
@ -11187,11 +11187,13 @@ namespace sol { namespace stack {
}
else if constexpr (std::is_same_v<T, luaL_Stream*> || std::is_same_v<T, luaL_Stream>) {
if (lua_getmetatable(L, index) == 0) {
type t = type_of(L, index);
handler(L, index, expected, t, "value is not a valid luaL_Stream (has no metatable/is not a valid value)");
return false;
}
luaL_getmetatable(L, LUA_FILEHANDLE);
if (type_of(L, index) != type::table) {
type t = type_of(L, index);
lua_pop(L, 1);
handler(L,
index,
@ -11204,6 +11206,7 @@ namespace sol { namespace stack {
int is_stream_table = lua_compare(L, -1, -2, LUA_OPEQ);
lua_pop(L, 2);
if (is_stream_table == 0) {
type t = type_of(L, index);
handler(L, index, expected, t, "value is not a valid luaL_Stream (incorrect metatable)");
return false;
}
@ -13416,15 +13419,15 @@ namespace sol { namespace stack {
lua_pushnumber(L, std::forward<Args>(args)...);
return 1;
}
else if constexpr (std::is_same<Tu, luaL_Stream*>) {
luaL_Stream* source(std::forward<Args>(Args)...);
else if constexpr (std::is_same_v<Tu, luaL_Stream*>) {
luaL_Stream* source { std::forward<Args>(args)... };
luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
stream->f = source->f;
stream->closef = source->closef;
return 1;
}
else if constexpr (std::is_same<Tu, luaL_Stream>) {
luaL_Stream& source(std::forward<Args>(Args)...);
else if constexpr (std::is_same_v<Tu, luaL_Stream>) {
luaL_Stream& source(std::forward<Args>(args)...);
luaL_Stream* stream = static_cast<luaL_Stream*>(lua_newuserdata(L, sizeof(luaL_Stream)));
stream->f = source.f;
stream->closef = source.closef;