summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Sluift/GenericLuaElementConvertor.h')
-rw-r--r--Sluift/GenericLuaElementConvertor.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/Sluift/GenericLuaElementConvertor.h b/Sluift/GenericLuaElementConvertor.h
index d94a324..4e52d9e 100644
--- a/Sluift/GenericLuaElementConvertor.h
+++ b/Sluift/GenericLuaElementConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,8 +10,6 @@
#include <lua.hpp>
-#include <Swiften/Base/Override.h>
-
#include <Sluift/Lua/Check.h>
#include <Sluift/Lua/LuaUtils.h>
#include <Sluift/LuaElementConvertor.h>
@@ -23,9 +21,9 @@ namespace Swift {
GenericLuaElementConvertor(const std::string& type) : type(type) {
}
- virtual ~GenericLuaElementConvertor() {}
+ virtual ~GenericLuaElementConvertor() override {}
- virtual std::shared_ptr<Element> convertFromLua(lua_State* L, int index, const std::string& payloadType) SWIFTEN_OVERRIDE {
+ virtual std::shared_ptr<Element> convertFromLua(lua_State* L, int index, const std::string& payloadType) override {
if (payloadType == type) {
Lua::checkType(L, index, LUA_TTABLE);
lua_pushvalue(L, index);
@@ -37,7 +35,7 @@ namespace Swift {
}
virtual boost::optional<std::string> convertToLua(
- lua_State* L, std::shared_ptr<Element> payload) SWIFTEN_OVERRIDE {
+ lua_State* L, std::shared_ptr<Element> payload) override {
if (std::shared_ptr<T> actualPayload = std::dynamic_pointer_cast<T>(payload)) {
doConvertToLua(L, actualPayload);
assert(lua_type(L, -1) == LUA_TTABLE);