Browse Source

lua: fix compilation issues.

undefined
Sam Hocevar 9 years ago
parent
commit
d97087fc8b
2 changed files with 17 additions and 11 deletions
  1. +0
    -2
      src/imgui/lolimgui.cpp
  2. +17
    -9
      src/lolua/baselua.h

+ 0
- 2
src/imgui/lolimgui.cpp View File

@@ -135,8 +135,6 @@ void LolImGui::TickGame(float seconds)
//Init Texture //Init Texture
if (!m_font) if (!m_font)
{ {
ImGuiIO& io = ImGui::GetIO();

// Build texture // Build texture
unsigned char* pixels; unsigned char* pixels;
ivec2 size; ivec2 size;


+ 17
- 9
src/lolua/baselua.h View File

@@ -227,14 +227,7 @@ protected:
} }


//------------------------------------------------------------------------- //-------------------------------------------------------------------------
template <typename TLuaClass>
static int Del(LuaState * l)
{
VarPtr<TLuaClass> obj; obj.Get(l, 1);
ASSERT(obj());
delete obj();
return 0;
}
template <typename TLuaClass> static int Del(LuaState * l);
}; };


//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -281,7 +274,7 @@ public:
inline T* operator=(T* value) { m_value = value; } inline T* operator=(T* value) { m_value = value; }
inline bool IsValid(LuaState* l, int index) inline bool IsValid(LuaState* l, int index)
{ {
return InnerValid(l, index);
return InnerIsValid(l, index);
} }
private: private:
inline void GetInc(LuaState* l, int& index) inline void GetInc(LuaState* l, int& index)
@@ -321,6 +314,21 @@ protected:
*data = m_value; *data = m_value;
} }
}; };

//
// Object member implementations that require VarPtr
//

template <typename TLuaClass>
int Object::Del(LuaState * l)
{
VarPtr<TLuaClass> obj;
obj.Get(l, 1);
ASSERT(obj());
delete obj();
return 0;
}

//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/* TODO: FIX THAT TOUKY !! /* TODO: FIX THAT TOUKY !!
template<typename T> template<typename T>


Loading…
Cancel
Save