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/LuaElementConvertors.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/LuaElementConvertors.h')
| -rw-r--r-- | Sluift/LuaElementConvertors.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Sluift/LuaElementConvertors.h b/Sluift/LuaElementConvertors.h index 8e1d10b..bfcffdd 100644 --- a/Sluift/LuaElementConvertors.h +++ b/Sluift/LuaElementConvertors.h @@ -1,45 +1,43 @@ /* - * Copyright (c) 2013-2016 Isode Limited. + * Copyright (c) 2013-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <vector> #include <boost/optional.hpp> -#include <Swiften/Base/Override.h> - struct lua_State; namespace Swift { class LuaElementConvertor; class Element; class LuaElementConvertors { public: LuaElementConvertors(); virtual ~LuaElementConvertors(); std::shared_ptr<Element> convertFromLua(lua_State*, int index); int convertToLua(lua_State*, std::shared_ptr<Element>); /** * Adds a toplevel type+data table with the given type. */ std::shared_ptr<Element> convertFromLuaUntyped(lua_State*, int index, const std::string& type); /** * Strips the toplevel type+data table, and only return the * data. */ int convertToLuaUntyped(lua_State*, std::shared_ptr<Element>); const std::vector< std::shared_ptr<LuaElementConvertor> >& getConvertors() const { return convertors; } private: |