diff options
author | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2017-07-13 06:07:37 (GMT) |
commit | 497dfb8ab128b0bbfdb6b3045caa03f8b38bc9fc (patch) | |
tree | 4d69e5ce56c755cf3b61aaf78e24729130f77e2e /Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h | |
parent | 8f4d198c4d3aa55a5215061e84572d5faf4e4117 (diff) | |
download | swift-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 'Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h')
-rw-r--r-- | Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h index d118016..f16a749 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h +++ b/Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h @@ -10,7 +10,6 @@ #include <vector> #include <Swiften/Base/API.h> -#include <Swiften/Base/Override.h> #include <Swiften/Elements/PubSubEvent.h> #include <Swiften/Serializer/GenericPayloadSerializer.h> @@ -20,9 +19,9 @@ namespace Swift { class SWIFTEN_API PubSubEventSerializer : public GenericPayloadSerializer<PubSubEvent> { public: PubSubEventSerializer(PayloadSerializerCollection* serializers); - virtual ~PubSubEventSerializer() SWIFTEN_OVERRIDE; + virtual ~PubSubEventSerializer() override; - virtual std::string serializePayload(std::shared_ptr<PubSubEvent>) const SWIFTEN_OVERRIDE; + virtual std::string serializePayload(std::shared_ptr<PubSubEvent>) const override; private: std::vector< std::shared_ptr<PayloadSerializer> > pubsubSerializers; |