Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
| commit | 497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch) | |
| tree | 4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Sluift/GenericLuaElementConvertor.h | |
| parent | 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff) | |
| download | swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.zip swift-497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc.tar.bz2 | |
Remove Swiften/Base/Override.h
Replaced SWIFTEN_OVERRIDE with C++11 standard override
keyword.
Test-Information:
Tested on macOS 10.12.5 with clang trunk.
Change-Id: If89c6cc2a648662522a320834c314496c943a55a
Diffstat (limited to 'Sluift/GenericLuaElementConvertor.h')
| -rw-r--r-- | Sluift/GenericLuaElementConvertor.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Sluift/GenericLuaElementConvertor.h b/Sluift/GenericLuaElementConvertor.h index 10ad851..4e52d9e 100644 --- a/Sluift/GenericLuaElementConvertor.h +++ b/Sluift/GenericLuaElementConvertor.h @@ -1,56 +1,54 @@ /* * Copyright (c) 2013-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <string> #include <lua.hpp> -#include <Swiften/Base/Override.h> - #include <Sluift/Lua/Check.h> #include <Sluift/Lua/LuaUtils.h> #include <Sluift/LuaElementConvertor.h> namespace Swift { template<typename T> class GenericLuaElementConvertor : public LuaElementConvertor { public: GenericLuaElementConvertor(const std::string& type) : type(type) { } - virtual ~GenericLuaElementConvertor() SWIFTEN_OVERRIDE {} + 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); std::shared_ptr<Element> result = doConvertFromLua(L); lua_pop(L, 1); return result; } return std::shared_ptr<Element>(); } 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); return type; } return NO_RESULT; } protected: virtual std::shared_ptr<T> doConvertFromLua(lua_State*) = 0; virtual void doConvertToLua(lua_State*, std::shared_ptr<T>) = 0; private: std::string type; }; } |