Fix bug with sol::object not being copyable

This commit is contained in:
Rapptz 2013-12-14 00:05:14 -05:00
parent bec0406ce6
commit c59fc9e536
3 changed files with 5 additions and 5 deletions

View File

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

View File

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

View File

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