From d72db3bf4b185d0c3a9916260c210bc89a68b5ae Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 8 Dec 2015 18:40:40 +0100 Subject: [PATCH] Lua/LuaInstance: Fix linker error Former-commit-id: cffd71467f31b7ef28e456ddd96dae1163bef145 --- include/Nazara/Lua/LuaInstance.inl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/Nazara/Lua/LuaInstance.inl b/include/Nazara/Lua/LuaInstance.inl index 57da097bc..c2153a4e1 100644 --- a/include/Nazara/Lua/LuaInstance.inl +++ b/include/Nazara/Lua/LuaInstance.inl @@ -8,17 +8,17 @@ namespace Nz { // Functions args - bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { return instance.CheckBoolean(index); } - double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { return instance.CheckNumber(index); } - float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { return static_cast(instance.CheckNumber(index)); } @@ -41,7 +41,7 @@ namespace Nz return static_cast(LuaImplQueryArg(instance, index, TypeTag::type>())); } - std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { std::size_t strLength = 0; const char* str = instance.CheckString(index, &strLength); @@ -49,7 +49,7 @@ namespace Nz return std::string(str, strLength); } - String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) + inline String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag) { std::size_t strLength = 0; const char* str = instance.CheckString(index, &strLength); @@ -64,19 +64,19 @@ namespace Nz } // Function returns - int LuaImplReplyVal(LuaInstance& instance, bool val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, bool val, TypeTag) { instance.PushBoolean(val); return 1; } - int LuaImplReplyVal(LuaInstance& instance, double val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, double val, TypeTag) { instance.PushNumber(val); return 1; } - int LuaImplReplyVal(LuaInstance& instance, float val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, float val, TypeTag) { instance.PushNumber(val); return 1; @@ -105,13 +105,13 @@ namespace Nz return LuaImplReplyVal(instance, static_cast(val), TypeTag()); } - int LuaImplReplyVal(LuaInstance& instance, std::string val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, std::string val, TypeTag) { instance.PushString(val.c_str(), val.size()); return 1; } - int LuaImplReplyVal(LuaInstance& instance, String val, TypeTag) + inline int LuaImplReplyVal(LuaInstance& instance, String val, TypeTag) { instance.PushString(std::move(val)); return 1;