diff 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/ElementConvertors/DOMElementConvertor.cpp | |
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/ElementConvertors/DOMElementConvertor.cpp')
-rw-r--r-- | Sluift/ElementConvertors/DOMElementConvertor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Sluift/ElementConvertors/DOMElementConvertor.cpp b/Sluift/ElementConvertors/DOMElementConvertor.cpp index b957686..56b45aa 100644 --- a/Sluift/ElementConvertors/DOMElementConvertor.cpp +++ b/Sluift/ElementConvertors/DOMElementConvertor.cpp @@ -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. */ @@ -34,7 +34,7 @@ namespace { virtual void handleStartElement( const std::string& element, const std::string& ns, - const AttributeMap& attributes) SWIFTEN_OVERRIDE { + const AttributeMap& attributes) override { lua_checkstack(L, 6); lua_pushnumber(L, currentIndex); lua_newtable(L); @@ -70,7 +70,7 @@ namespace { } virtual void handleEndElement( - const std::string&, const std::string&) SWIFTEN_OVERRIDE { + const std::string&, const std::string&) override { lua_setfield(L, -2, "children"); lua_settable(L, -3); currentIndex = indexStack.back(); @@ -78,7 +78,7 @@ namespace { currentIndex++; } - virtual void handleCharacterData(const std::string& data) SWIFTEN_OVERRIDE { + virtual void handleCharacterData(const std::string& data) override { lua_checkstack(L, 2); lua_pushnumber(L, currentIndex); lua_pushstring(L, data.c_str()); |