diff options
Diffstat (limited to 'Swiften/Parser')
-rw-r--r-- | Swiften/Parser/BOSHBodyExtractor.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/ElementParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/ExpatParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/IQParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/MessageParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/PayloadParsers/RawXMLPayloadParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/PresenceParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/SerializingParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/StanzaAckParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/StanzaParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/StreamFeaturesParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/StreamManagementEnabledParser.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/Tree/ParserElement.h | 3 | ||||
-rw-r--r-- | Swiften/Parser/UnitTest/GenericPayloadTreeParserTest.cpp | 8 |
14 files changed, 34 insertions, 13 deletions
diff --git a/Swiften/Parser/BOSHBodyExtractor.h b/Swiften/Parser/BOSHBodyExtractor.h index 07203ae..7510761 100644 --- a/Swiften/Parser/BOSHBodyExtractor.h +++ b/Swiften/Parser/BOSHBodyExtractor.h @@ -8,13 +8,14 @@ #include <boost/optional.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Base/ByteArray.h> #include <Swiften/Parser/XMLParserClient.h> namespace Swift { class XMLParserFactory; - class BOSHBodyExtractor { + class SWIFTEN_API BOSHBodyExtractor { friend class BOSHBodyParserClient; public: struct BOSHBody { diff --git a/Swiften/Parser/ElementParser.h b/Swiften/Parser/ElementParser.h index a11b505..1815240 100644 --- a/Swiften/Parser/ElementParser.h +++ b/Swiften/Parser/ElementParser.h @@ -9,11 +9,12 @@ #include <boost/shared_ptr.hpp> #include <string> +#include <Swiften/Base/API.h> #include <Swiften/Elements/Element.h> #include <Swiften/Parser/AttributeMap.h> namespace Swift { - class ElementParser { + class SWIFTEN_API ElementParser { public: virtual ~ElementParser(); diff --git a/Swiften/Parser/ExpatParser.h b/Swiften/Parser/ExpatParser.h index 956e83f..dcb0915 100644 --- a/Swiften/Parser/ExpatParser.h +++ b/Swiften/Parser/ExpatParser.h @@ -9,10 +9,11 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Parser/XMLParser.h> namespace Swift { - class ExpatParser : public XMLParser, public boost::noncopyable { + class SWIFTEN_API ExpatParser : public XMLParser, public boost::noncopyable { public: ExpatParser(XMLParserClient* client); ~ExpatParser(); diff --git a/Swiften/Parser/IQParser.h b/Swiften/Parser/IQParser.h index a7aa967..9773835 100644 --- a/Swiften/Parser/IQParser.h +++ b/Swiften/Parser/IQParser.h @@ -6,11 +6,12 @@ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Parser/GenericStanzaParser.h> #include <Swiften/Elements/IQ.h> namespace Swift { - class IQParser : public GenericStanzaParser<IQ> { + class SWIFTEN_API IQParser : public GenericStanzaParser<IQ> { public: IQParser(PayloadParserFactoryCollection* factories); diff --git a/Swiften/Parser/MessageParser.h b/Swiften/Parser/MessageParser.h index a8aaa99..e908339 100644 --- a/Swiften/Parser/MessageParser.h +++ b/Swiften/Parser/MessageParser.h @@ -6,11 +6,12 @@ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Parser/GenericStanzaParser.h> #include <Swiften/Elements/Message.h> namespace Swift { - class MessageParser : public GenericStanzaParser<Message> { + class SWIFTEN_API MessageParser : public GenericStanzaParser<Message> { public: MessageParser(PayloadParserFactoryCollection* factories); diff --git a/Swiften/Parser/PayloadParsers/RawXMLPayloadParser.h b/Swiften/Parser/PayloadParsers/RawXMLPayloadParser.h index 4a027a1..2e16d00 100644 --- a/Swiften/Parser/PayloadParsers/RawXMLPayloadParser.h +++ b/Swiften/Parser/PayloadParsers/RawXMLPayloadParser.h @@ -6,6 +6,7 @@ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Elements/RawXMLPayload.h> #include <Swiften/Parser/GenericPayloadParser.h> #include <Swiften/Parser/SerializingParser.h> @@ -13,7 +14,7 @@ namespace Swift { class SerializingParser; - class RawXMLPayloadParser : public GenericPayloadParser<RawXMLPayload> { + class SWIFTEN_API RawXMLPayloadParser : public GenericPayloadParser<RawXMLPayload> { public: RawXMLPayloadParser(); diff --git a/Swiften/Parser/PresenceParser.h b/Swiften/Parser/PresenceParser.h index 19f90b3..eb07af8 100644 --- a/Swiften/Parser/PresenceParser.h +++ b/Swiften/Parser/PresenceParser.h @@ -6,11 +6,12 @@ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Parser/GenericStanzaParser.h> #include <Swiften/Elements/Presence.h> namespace Swift { - class PresenceParser : public GenericStanzaParser<Presence> { + class SWIFTEN_API PresenceParser : public GenericStanzaParser<Presence> { public: PresenceParser(PayloadParserFactoryCollection* factories); diff --git a/Swiften/Parser/SerializingParser.h b/Swiften/Parser/SerializingParser.h index 5f2c0cd..7706961 100644 --- a/Swiften/Parser/SerializingParser.h +++ b/Swiften/Parser/SerializingParser.h @@ -7,11 +7,12 @@ #pragma once #include <string> +#include <Swiften/Base/API.h> #include <Swiften/Parser/AttributeMap.h> #include <Swiften/Serializer/XML/XMLElement.h> namespace Swift { - class SerializingParser { + class SWIFTEN_API SerializingParser { public: SerializingParser(); diff --git a/Swiften/Parser/StanzaAckParser.h b/Swiften/Parser/StanzaAckParser.h index c188878..c453039 100644 --- a/Swiften/Parser/StanzaAckParser.h +++ b/Swiften/Parser/StanzaAckParser.h @@ -6,11 +6,12 @@ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Parser/GenericElementParser.h> #include <Swiften/Elements/StanzaAck.h> namespace Swift { - class StanzaAckParser : public GenericElementParser<StanzaAck> { + class SWIFTEN_API StanzaAckParser : public GenericElementParser<StanzaAck> { public: StanzaAckParser(); diff --git a/Swiften/Parser/StanzaParser.h b/Swiften/Parser/StanzaParser.h index 6887981..0af6b43 100644 --- a/Swiften/Parser/StanzaParser.h +++ b/Swiften/Parser/StanzaParser.h @@ -9,6 +9,7 @@ #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <string> #include <Swiften/Elements/Stanza.h> #include <Swiften/Parser/ElementParser.h> @@ -18,7 +19,7 @@ namespace Swift { class PayloadParser; class PayloadParserFactoryCollection; - class StanzaParser : public ElementParser, public boost::noncopyable { + class SWIFTEN_API StanzaParser : public ElementParser, public boost::noncopyable { public: StanzaParser(PayloadParserFactoryCollection* factories); ~StanzaParser(); diff --git a/Swiften/Parser/StreamFeaturesParser.h b/Swiften/Parser/StreamFeaturesParser.h index d55abe9..4bbb31c 100644 --- a/Swiften/Parser/StreamFeaturesParser.h +++ b/Swiften/Parser/StreamFeaturesParser.h @@ -7,11 +7,12 @@ #pragma once #include <string> +#include <Swiften/Base/API.h> #include <Swiften/Parser/GenericElementParser.h> #include <Swiften/Elements/StreamFeatures.h> namespace Swift { - class StreamFeaturesParser : public GenericElementParser<StreamFeatures> { + class SWIFTEN_API StreamFeaturesParser : public GenericElementParser<StreamFeatures> { public: StreamFeaturesParser(); diff --git a/Swiften/Parser/StreamManagementEnabledParser.h b/Swiften/Parser/StreamManagementEnabledParser.h index db616af..dfe232c 100644 --- a/Swiften/Parser/StreamManagementEnabledParser.h +++ b/Swiften/Parser/StreamManagementEnabledParser.h @@ -8,9 +8,10 @@ #include <Swiften/Parser/GenericElementParser.h> #include <Swiften/Elements/StreamManagementEnabled.h> +#include <Swiften/Base/API.h> namespace Swift { - class StreamManagementEnabledParser : public GenericElementParser<StreamManagementEnabled> { + class SWIFTEN_API StreamManagementEnabledParser : public GenericElementParser<StreamManagementEnabled> { public: StreamManagementEnabledParser(); ~StreamManagementEnabledParser(); diff --git a/Swiften/Parser/Tree/ParserElement.h b/Swiften/Parser/Tree/ParserElement.h index b268c76..6be0631 100644 --- a/Swiften/Parser/Tree/ParserElement.h +++ b/Swiften/Parser/Tree/ParserElement.h @@ -9,13 +9,14 @@ #include <string> #include <vector> +#include <Swiften/Base/API.h> #include <Swiften/Base/boost_bsignals.h> #include <Swiften/Parser/AttributeMap.h> #include <boost/shared_ptr.hpp> #include <boost/smart_ptr/make_shared.hpp> namespace Swift { - class ParserElement { + class SWIFTEN_API ParserElement { public: typedef boost::shared_ptr<ParserElement> ref; diff --git a/Swiften/Parser/UnitTest/GenericPayloadTreeParserTest.cpp b/Swiften/Parser/UnitTest/GenericPayloadTreeParserTest.cpp index d095afc..93d4e7f 100644 --- a/Swiften/Parser/UnitTest/GenericPayloadTreeParserTest.cpp +++ b/Swiften/Parser/UnitTest/GenericPayloadTreeParserTest.cpp @@ -7,12 +7,20 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> +#include <Swiften/Base/Platform.h> #include <Swiften/Parser/GenericPayloadTreeParser.h> #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h> #include <Swiften/Elements/RawXMLPayload.h> using namespace Swift; + +#if !SWIFTEN_STATIC && defined(SWIFTEN_PLATFORM_WINDOWS) +// This base class of a class used in this file is already exported, so need to +// explicitly import it. +template class __declspec(dllimport) Swift::GenericPayloadParser<RawXMLPayload>; +#endif + class GenericPayloadTreeParserTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(GenericPayloadTreeParserTest); CPPUNIT_TEST(testTree); |