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 #323 from RaptorFactor/develop

Browse Source 
Work around clang-cl compilation issue.
This commit is contained in:
The Phantom Derpstorm 2017-01-26 10:18:04 -05:00 committed by GitHub
commit 4957a6ee5d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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-01-10 04:24:27.805667 UTC // Generated 2017-01-26 01:38:28.868453 UTC
// This header was generated with sol v2.15.7 (revision 490194f) // This header was generated with sol v2.15.7 (revision 5b12924)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -793,7 +793,7 @@ namespace sol {
#ifdef SOL_USING_CXX_LUA #ifdef SOL_USING_CXX_LUA
#include <lua.h> #include <lua.h>
#include <lualib.h> #include <lualib.h>
#include <luaxlib.h> #include <lauxlib.h>
#else #else
#include <lua.hpp> #include <lua.hpp>
#endif // C++-compiler Lua #endif // C++-compiler Lua
@ -4128,7 +4128,7 @@ namespace sol {
void set_extra(std::true_type, std::index_sequence<I...>, T&& target) { void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
using std::get; using std::get;
(void)detail::swallow{ 0, (void)detail::swallow{ 0,
(get<I>(*this) = get<I>(types<Tn...>(), target), 0)... (get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)...
, 0 }; , 0 };
} }
@ -4136,7 +4136,7 @@ namespace sol {
void set_extra(std::false_type, std::index_sequence<I...>, T&& target) { void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
using std::get; using std::get;
(void)detail::swallow{ 0, (void)detail::swallow{ 0,
(get<I>(*this) = get<I>(target), 0)... (get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)...
, 0 }; , 0 };
} }

4
sol/tie.hpp
View File

@ -60,7 +60,7 @@ namespace sol {
void set_extra(std::true_type, std::index_sequence<I...>, T&& target) { void set_extra(std::true_type, std::index_sequence<I...>, T&& target) {
using std::get; using std::get;
(void)detail::swallow{ 0, (void)detail::swallow{ 0,
(get<I>(*this) = get<I>(types<Tn...>(), target), 0)... (get<I>(static_cast<base_t&>(*this)) = get<I>(types<Tn...>(), target), 0)...
, 0 }; , 0 };
} }
@ -68,7 +68,7 @@ namespace sol {
void set_extra(std::false_type, std::index_sequence<I...>, T&& target) { void set_extra(std::false_type, std::index_sequence<I...>, T&& target) {
using std::get; using std::get;
(void)detail::swallow{ 0, (void)detail::swallow{ 0,
(get<I>(*this) = get<I>(target), 0)... (get<I>(static_cast<base_t&>(*this)) = get<I>(target), 0)...
, 0 }; , 0 };
} }