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

Update travis script, fix warnings.

Browse Source
This commit is contained in:
Rapptz 2014-08-04 21:05:47 -04:00
parent 721c6f1dae
commit 2ac3e27229
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -11,7 +11,7 @@ before_install:
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository -y ppa:saiarcot895/chromium-beta - sudo add-apt-repository -y ppa:saiarcot895/chromium-beta
- sudo apt-get --yes update - sudo apt-get --yes update
- if [ "$CXX" == "g++" ]; then sudo apt-get --yes install g++-4.8; export CXX=g++-4.8; fi - sudo apt-get --yes install g++-4.8
- sudo apt-get --yes install ninja-build - sudo apt-get --yes install ninja-build
- sudo apt-get --yes install liblua5.2-dev - sudo apt-get --yes install liblua5.2-dev

2
sol/function_types.hpp
View File

@ -70,7 +70,7 @@ struct functor<T, Func, R, true> {
functor(FxArgs&&... fxargs): item(nullptr), invocation(std::forward<FxArgs>(fxargs)...) {} functor(FxArgs&&... fxargs): item(nullptr), invocation(std::forward<FxArgs>(fxargs)...) {}
template<typename Arg, typename... Args> template<typename Arg, typename... Args>
void operator()(Arg&& arg, Args&&... args) { void operator()(Arg&& arg, Args&&...) {
T& member = *item; T& member = *item;
(member.*invocation) = std::forward<Arg>(arg); (member.*invocation) = std::forward<Arg>(arg);
} }

8
sol/userdata.hpp
View File

@ -314,13 +314,13 @@ private:
}; };
template <typename T> template <typename T>
const std::array<std::string, 2> userdata<T>::metavariablenames = { const std::array<std::string, 2> userdata<T>::metavariablenames = {{
"__index", "__index",
"__newindex" "__newindex"
}; }};
template <typename T> template <typename T>
const std::array<std::string, 19> userdata<T>::metafunctionnames = { const std::array<std::string, 19> userdata<T>::metafunctionnames = {{
"__index", "__index",
"__newindex", "__newindex",
"__mode", "__mode",
@ -340,7 +340,7 @@ const std::array<std::string, 19> userdata<T>::metafunctionnames = {
"__eq", "__eq",
"__lt", "__lt",
"__le", "__le",
}; }};
namespace stack { namespace stack {
template <typename T> template <typename T>