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 #653 from OrfeasZ/vc140-fixes

Browse Source 
Fix vc140 compilation issues
This commit is contained in:
The Phantom Derpstorm 2018-06-15 13:28:33 -04:00 committed by GitHub
commit b9e96bd2ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sol/types.hpp
View File

@ -319,7 +319,7 @@ namespace sol {
struct user {
U value;
user(U x)
user(U&& x)
: value(std::forward<U>(x)) {
}
operator std::add_pointer_t<std::remove_reference_t<U>>() {

6
tests/test_sol.hpp
View File

@ -36,14 +36,14 @@
#endif // SOL_DEFAULT_PASS_ON_ERROR
*/
#include <iostream>
#include <cstdlib>
#ifdef TEST_SINGLE
#include <sol_forward.hpp>
#endif // Single
#include <sol.hpp>
#include <iostream>
#include <cstdlib>
struct test_stack_guard {
lua_State* L;
int& begintop;

2
tests/test_usertypes.cpp
View File

@ -310,7 +310,7 @@ struct alignas(16) weird_aligned_wrapper {
}
void operator()(SelfType& self, sol::object param) const {
lambda(self, param.as<float>());
}
}
std::function<void(SelfType&, float)> lambda;
};