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 remote-tracking branch 'root/master'

Browse Source 
* root/master:
  Cast result of floating point retrieval before receiving it
  Fix bug with sol::object not being copyable
This commit is contained in:
ThePhD 2013-12-14 00:15:25 -05:00
commit 20ff49cd66
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/function.hpp
View File

@ -27,7 +27,7 @@
#include "stack.hpp"
namespace sol {
class function : virtual public reference {
class function : public reference {
private:
void luacall (std::size_t argcount, std::size_t resultcount) {
lua_call(state(), static_cast<uint32_t>(argcount), static_cast<uint32_t>(resultcount));

6
sol/object.hpp
View File

@ -22,11 +22,11 @@
#ifndef SOL_OBJECT_HPP
#define SOL_OBJECT_HPP
#include "table.hpp"
#include "function.hpp"
#include "reference.hpp"
#include "stack.hpp"
namespace sol {
class object : public table, public function {
class object : public reference {
public:
object(lua_State* L, int index = -1): reference(L, index) {}
object() = default;

2
sol/table.hpp
View File

@ -40,7 +40,7 @@ T* get_ptr(T* val) {
}
} // detail
class table : virtual public reference {
class table : public reference {
template<typename Table, typename T> struct proxy;
public:
table() noexcept : reference() {}