Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-07-15 14:45:28 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-01 12:15:02 (GMT) |
| commit | a2296b00c88df201b0eb58e867aeb17a87e6332c (patch) | |
| tree | 9fdebba1b5e9202ca669786a41dd94f080ba5807 /Swiften/Serializer | |
| parent | a24d8c0e93d70312fc90d5fdf6214ade9a475e92 (diff) | |
| download | swift-a2296b00c88df201b0eb58e867aeb17a87e6332c.zip swift-a2296b00c88df201b0eb58e867aeb17a87e6332c.tar.bz2 | |
Port many of Isode's local fixes upstream
Includes fixes to:
Build with new Visual Studio and Boost
Avoid error caused when Avahi is present but Qt is not
Make declaration of XMPPRosterImpl::addContact consistent with implementation
Includes enhancements to:
Allow user-configurable mt.exe
Allow splitting openssl paths
Allow disabling gconf lookup
Make idn support optional
Allow disabling various library detections
Remove use of non-Python2.4 features in sconscripts
Test-Information:
Builds
Change-Id: Iee91ee80291a8bdf87cc169c915e4dad1cc1055b
Diffstat (limited to 'Swiften/Serializer')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializerCollection.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Serializer/PayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializerCollection.cpp index ab2b4f4..0db89a9 100644 --- a/Swiften/Serializer/PayloadSerializerCollection.cpp +++ b/Swiften/Serializer/PayloadSerializerCollection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Remko Tronçon + * Copyright (c) 2010-2014 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ @@ -20,12 +20,12 @@ void PayloadSerializerCollection::addSerializer(PayloadSerializer* serializer) { } void PayloadSerializerCollection::removeSerializer(PayloadSerializer* serializer) { - serializers_.erase(remove(serializers_.begin(), serializers_.end(), serializer), serializers_.end()); + serializers_.erase(std::remove(serializers_.begin(), serializers_.end(), serializer), serializers_.end()); } PayloadSerializer* PayloadSerializerCollection::getPayloadSerializer(boost::shared_ptr<Payload> payload) const { std::vector<PayloadSerializer*>::const_iterator i = std::find_if( - serializers_.begin(), serializers_.end(), + serializers_.begin(), serializers_.end(), boost::bind(&PayloadSerializer::canSerialize, _1, payload)); return (i != serializers_.end() ? *i : NULL); } |