Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-10-04 12:15:57 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-10-04 13:44:51 (GMT) |
| commit | bdb9fd141bc1cf5f9134dd095d364c08113a2c87 (patch) | |
| tree | 458ce57a5d1c3feec6112567c843e5308008a5dc /Sluift | |
| parent | 9a4cee8bc017c8344fe5fc8777f42f29a1b69ee1 (diff) | |
| download | swift-bdb9fd141bc1cf5f9134dd095d364c08113a2c87.zip swift-bdb9fd141bc1cf5f9134dd095d364c08113a2c87.tar.bz2 | |
Remove optional_fwd.hpp use; workaround for Boost Ticket #12179
Test-Information:
Builds on macOS 10.12 and unit tests pass.
Change-Id: Ia979e7dbd6f6c84085b1b951d81b925dffbed262
Diffstat (limited to 'Sluift')
| -rw-r--r-- | Sluift/Console.h | 2 | ||||
| -rw-r--r-- | Sluift/ITunesInterface.h | 2 | ||||
| -rw-r--r-- | Sluift/Terminal.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Sluift/Console.h b/Sluift/Console.h index 8c93b2d..b53a167 100644 --- a/Sluift/Console.h +++ b/Sluift/Console.h @@ -1,40 +1,40 @@ /* * Copyright (c) 2013 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <string> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Sluift/Completer.h> #include <Swiften/Base/Override.h> struct lua_State; namespace Swift { class Terminal; class Console : public Completer { public: Console(lua_State* L, Terminal* terminal); virtual ~Console(); void run(); static int call(lua_State* L, int numberOfArguments, bool keepResult); private: std::string getPrompt(bool firstLine) const; std::string getErrorMessage() const; bool readCommand(); int tryLoadCommand(const std::string& command); virtual std::vector<std::string> getCompletions(const std::string&, int start, int end) SWIFTEN_OVERRIDE; private: lua_State* L; Terminal* terminal; int previousNumberOfReturnArguments; }; diff --git a/Sluift/ITunesInterface.h b/Sluift/ITunesInterface.h index e854da4..73555d2 100644 --- a/Sluift/ITunesInterface.h +++ b/Sluift/ITunesInterface.h @@ -1,38 +1,38 @@ /* * Copyright (c) 2014 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <Swiften/Base/API.h> #include <boost/shared_ptr.hpp> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> namespace Swift { class SWIFTEN_API ITunesInterface { public: struct Track { std::string name; std::string artist; std::string album; long trackNumber; double duration; long rating; }; ITunesInterface(); virtual ~ITunesInterface(); boost::optional<Track> getCurrentTrack() const; private: bool haveApplication() const; private: struct Private; boost::shared_ptr<Private> p; }; } diff --git a/Sluift/Terminal.h b/Sluift/Terminal.h index 60bb060..3bc63e3 100644 --- a/Sluift/Terminal.h +++ b/Sluift/Terminal.h @@ -1,35 +1,35 @@ /* * Copyright (c) 2013 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <string> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> namespace Swift { class Completer; class Terminal { public: Terminal(); virtual ~Terminal(); Completer* getCompleter() const { return completer; } void setCompleter(Completer* completer) { this->completer = completer; } virtual boost::optional<std::string> readLine(const std::string& prompt) = 0; virtual void addToHistory(const std::string& command) = 0; virtual void printError(const std::string& message) = 0; private: Completer* completer; }; } |