summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-07-13 06:07:37 (GMT)
committerTobias Markmann <tm@ayena.de>2017-07-13 06:07:37 (GMT)
commit497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch)
tree4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Sluift/Console.h
parent8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff)
downloadswift-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/Console.h')
-rw-r--r--Sluift/Console.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/Sluift/Console.h b/Sluift/Console.h
index dc51dab..0d5ceb0 100644
--- a/Sluift/Console.h
+++ b/Sluift/Console.h
@@ -10,8 +10,6 @@
#include <boost/optional/optional.hpp>
-#include <Swiften/Base/Override.h>
-
#include <Sluift/Completer.h>
struct lua_State;
@@ -22,7 +20,7 @@ namespace Swift {
class Console : public Completer {
public:
Console(lua_State* L, Terminal* terminal);
- virtual ~Console() SWIFTEN_OVERRIDE;
+ virtual ~Console() override;
void run();
@@ -34,7 +32,7 @@ namespace Swift {
bool readCommand();
int tryLoadCommand(const std::string& command);
- virtual std::vector<std::string> getCompletions(const std::string&, int start, int end) SWIFTEN_OVERRIDE;
+ virtual std::vector<std::string> getCompletions(const std::string&, int start, int end) override;
private:
lua_State* L;