Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-07-15 09:06:08 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-07-15 10:26:22 (GMT) |
| commit | 8dce1cd03729624a25a98dd2c0d026b93e452f86 (patch) | |
| tree | d44d870614067cc8ee53033a9657b359d9d6ebf9 | |
| parent | 4a5edee04bd9d31f84c1c48d90d75b04be3adbb6 (diff) | |
| download | swift-8dce1cd03729624a25a98dd2c0d026b93e452f86.zip swift-8dce1cd03729624a25a98dd2c0d026b93e452f86.tar.bz2 | |
Add missing includes for assert()swift-4.0beta1
This fixes building via
./Swift/Packaging/Debian/package_all_platforms.sh .
Removed #pragma statements and did minimal associated cleanup.
Test-Information:
./Swift/Packaging/Debian/package_all_platforms.sh passes
successfully.
./scons test=all passes on OS X 10.11.5.
Change-Id: I1688da31ca6081eddfcda83d473b15c3f711b420
14 files changed, 25 insertions, 34 deletions
diff --git a/Swiften/Elements/Form.h b/Swiften/Elements/Form.h index 85ba9c7..899fb93 100644 --- a/Swiften/Elements/Form.h +++ b/Swiften/Elements/Form.h @@ -6,6 +6,7 @@ #pragma once +#include <cassert> #include <string> #include <vector> diff --git a/Swiften/Elements/FormField.h b/Swiften/Elements/FormField.h index 2d71ac7..194589c 100644 --- a/Swiften/Elements/FormField.h +++ b/Swiften/Elements/FormField.h @@ -6,6 +6,7 @@ #pragma once +#include <cassert> #include <memory> #include <string> #include <vector> diff --git a/Swiften/Parser/PayloadParsers/SecurityLabelParser.cpp b/Swiften/Parser/PayloadParsers/SecurityLabelParser.cpp index 3dd5811..6e2319f 100644 --- a/Swiften/Parser/PayloadParsers/SecurityLabelParser.cpp +++ b/Swiften/Parser/PayloadParsers/SecurityLabelParser.cpp @@ -6,6 +6,8 @@ #include <Swiften/Parser/PayloadParsers/SecurityLabelParser.h> +#include <cassert> + #include <Swiften/Parser/SerializingParser.h> namespace Swift { diff --git a/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp b/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp index 0de7544..1897080 100644 --- a/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp +++ b/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp @@ -6,6 +6,7 @@ #include <Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.h> +#include <cassert> #include <memory> #include <Swiften/Parser/PayloadParsers/SecurityLabelParser.h> diff --git a/Swiften/Parser/SerializingParser.cpp b/Swiften/Parser/SerializingParser.cpp index 9e39279..ad794aa 100644 --- a/Swiften/Parser/SerializingParser.cpp +++ b/Swiften/Parser/SerializingParser.cpp @@ -6,6 +6,7 @@ #include <Swiften/Parser/SerializingParser.h> +#include <cassert> #include <memory> #include <Swiften/Base/foreach.h> diff --git a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.cpp index 4814c59..e72c304 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.cpp @@ -4,18 +4,15 @@ * See the COPYING file for more information. */ -#pragma clang diagnostic ignored "-Wunused-private-field" - #include <Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h> -#include <Swiften/Serializer/XML/XMLElement.h> +#include <cassert> -#include <Swiften/Serializer/PayloadSerializerCollection.h> - +#include <Swiften/Serializer/XML/XMLElement.h> using namespace Swift; -PubSubAffiliationSerializer::PubSubAffiliationSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) { +PubSubAffiliationSerializer::PubSubAffiliationSerializer(PayloadSerializerCollection* /*serializers*/) { } PubSubAffiliationSerializer::~PubSubAffiliationSerializer() { diff --git a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h index 622db09..8862414 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h +++ b/Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h @@ -25,8 +25,5 @@ namespace Swift { private: static std::string serializeType(PubSubAffiliation::Type); - - private: - PayloadSerializerCollection* serializers; }; } diff --git a/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.cpp index 5f85fd5..1f98e7b 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.cpp @@ -6,6 +6,8 @@ #include <Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h> +#include <cassert> + #include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Serializer/XML/XMLElement.h> diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.cpp index 602eb34..1387b07 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.cpp @@ -4,18 +4,16 @@ * See the COPYING file for more information. */ -#pragma clang diagnostic ignored "-Wunused-private-field" - #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h> -#include <Swiften/Serializer/XML/XMLElement.h> +#include <cassert> #include <Swiften/Serializer/PayloadSerializerCollection.h> - +#include <Swiften/Serializer/XML/XMLElement.h> using namespace Swift; -PubSubOwnerAffiliationSerializer::PubSubOwnerAffiliationSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) { +PubSubOwnerAffiliationSerializer::PubSubOwnerAffiliationSerializer(PayloadSerializerCollection* /*serializers*/) { } PubSubOwnerAffiliationSerializer::~PubSubOwnerAffiliationSerializer() { diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h index ad1c963..ac6379a 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h +++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h @@ -25,8 +25,5 @@ namespace Swift { private: static std::string serializeType(PubSubOwnerAffiliation::Type); - - private: - PayloadSerializerCollection* serializers; }; } diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.cpp index 3df3686..7810e2f 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.cpp @@ -4,15 +4,15 @@ * See the COPYING file for more information. */ -#pragma clang diagnostic ignored "-Wunused-private-field" - #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.h> -#include <Swiften/Serializer/XML/XMLElement.h> + +#include <cassert> #include <memory> -#include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Base/foreach.h> +#include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h> +#include <Swiften/Serializer/XML/XMLElement.h> #include <Swiften/Serializer/XML/XMLRawTextNode.h> using namespace Swift; diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.cpp index 5f6b505..842df98 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.cpp @@ -4,18 +4,15 @@ * See the COPYING file for more information. */ -#pragma clang diagnostic ignored "-Wunused-private-field" - #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h> -#include <Swiften/Serializer/XML/XMLElement.h> +#include <cassert> -#include <Swiften/Serializer/PayloadSerializerCollection.h> - +#include <Swiften/Serializer/XML/XMLElement.h> using namespace Swift; -PubSubOwnerSubscriptionSerializer::PubSubOwnerSubscriptionSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) { +PubSubOwnerSubscriptionSerializer::PubSubOwnerSubscriptionSerializer(PayloadSerializerCollection* /*serializers*/) { } PubSubOwnerSubscriptionSerializer::~PubSubOwnerSubscriptionSerializer() { diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h index df025e0..9f9e80d 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h +++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h @@ -25,8 +25,5 @@ namespace Swift { private: static std::string serializeSubscriptionType(PubSubOwnerSubscription::SubscriptionType); - - private: - PayloadSerializerCollection* serializers; }; } diff --git a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp index 106efaa..9a6ca32 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.cpp @@ -4,15 +4,15 @@ * See the COPYING file for more information. */ -#pragma clang diagnostic ignored "-Wunused-private-field" - #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.h> -#include <Swiften/Serializer/XML/XMLElement.h> + +#include <cassert> #include <memory> -#include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Base/foreach.h> +#include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h> +#include <Swiften/Serializer/XML/XMLElement.h> #include <Swiften/Serializer/XML/XMLRawTextNode.h> using namespace Swift; |