Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:30 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-12-15 14:49:46 (GMT) |
| commit | 6cd7bef6eb507f979d7c964769429ef46e3e5aa9 (patch) | |
| tree | 322d5c80e7be477758a8e97ecd8a64fbb09836de /Swiften/Parser/AttributeMap.h | |
| parent | 864904bcd7931ff7453ecb1de72496e4e3cf9c96 (diff) | |
| parent | 2efefdc5ae847f5d187762e474d75c61560cba19 (diff) | |
| download | swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.zip swift-6cd7bef6eb507f979d7c964769429ef46e3e5aa9.tar.bz2 | |
Merge branch 'swift-3.x’
* swift-3.x:
- Fix building Swift on 32-bit Linux distributions
- Remove optional_fwd.hpp use; workaround for Boost Bug #12179
- Split COPYING.thirdparty in contributions/dependencies
- Fixes for building packages on Debian
Conflicts:
BuildTools/SCons/SConstruct
Sluift/Console.h
Sluift/ITunesInterface.h
Sluift/Terminal.h
Swift/Packaging/Debian/debian/control.in
Swift/QtUI/SConscript
Swiften/Elements/Stanza.h
Swiften/FileTransfer/FileTransferTransporter.h
Swiften/FileTransfer/IBBReceiveSession.h
Swiften/JID/JID.h
Swiften/Network/BoostConnectionServer.h
Swiften/Network/ConnectionServer.h
Swiften/Parser/AttributeMap.h
Test-Information:
Builds on macOS 10.12.1 with clang trunk.
Change-Id: I9f41ab199f227bc106721627ea994313c68e5cfe
Diffstat (limited to 'Swiften/Parser/AttributeMap.h')
| -rw-r--r-- | Swiften/Parser/AttributeMap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Parser/AttributeMap.h b/Swiften/Parser/AttributeMap.h index 798649a..804d6aa 100644 --- a/Swiften/Parser/AttributeMap.h +++ b/Swiften/Parser/AttributeMap.h @@ -1,43 +1,43 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <map> #include <string> #include <vector> -#include <boost/optional/optional_fwd.hpp> +#include <boost/optional/optional.hpp> #include <Swiften/Base/API.h> #include <Swiften/Parser/Attribute.h> namespace Swift { class SWIFTEN_API AttributeMap { public: class Entry { public: Entry(const Attribute& attribute, const std::string& value) : attribute(attribute), value(value) { } const Attribute& getAttribute() const { return attribute; } const std::string& getValue() const { return value; } private: Attribute attribute; std::string value; }; AttributeMap(); std::string getAttribute(const std::string& attribute, const std::string& ns = "") const; bool getBoolAttribute(const std::string& attribute, bool defaultValue = false) const; boost::optional<std::string> getAttributeValue(const std::string&) const; |