From db5ad2e09a6b38e841463dbe7eb076492b62c948 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 18 Aug 2009 15:58:17 +0200 Subject: Mad funktioniert jetzt unter Windows --- src/Common/XmlPacket.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src/Common/XmlPacket.h') diff --git a/src/Common/XmlPacket.h b/src/Common/XmlPacket.h index 546525a..9d63075 100644 --- a/src/Common/XmlPacket.h +++ b/src/Common/XmlPacket.h @@ -20,6 +20,8 @@ #ifndef MAD_COMMON_XMLPACKET_H_ #define MAD_COMMON_XMLPACKET_H_ +#include "export.h" + #include #include @@ -40,7 +42,7 @@ namespace Mad { namespace Common { -class XmlPacket { +class MAD_COMMON_EXPORT XmlPacket { public: class Entry; class List; @@ -50,7 +52,7 @@ class XmlPacket { xmlNodePtr packetNode; Entry *entry; - class Element : private boost::noncopyable { + class MAD_COMMON_EXPORT Element : private boost::noncopyable { private: friend class Entry; @@ -130,7 +132,7 @@ class XmlPacket { }; public: - class Entry : private boost::noncopyable { + class MAD_COMMON_EXPORT Entry : private boost::noncopyable { private: friend class List; friend class XmlPacket; @@ -284,7 +286,7 @@ class XmlPacket { } }; - class List : private boost::noncopyable { + class MAD_COMMON_EXPORT List : private boost::noncopyable { private: friend class Entry; @@ -302,7 +304,8 @@ class XmlPacket { typedef value_type &reference; typedef value_type *pointer; - typedef ssize_t difference_type; + typedef long difference_type; + private: IteratorType it; @@ -476,14 +479,14 @@ class XmlPacket { entry->unset(name); } - Net::Packet encode(uint16_t requestId) const; + Net::Packet encode(boost::uint16_t requestId) const; }; -template <> std::string XmlPacket::Entry::get(const std::string &name) const; -template <> const std::string& XmlPacket::Entry::get(const std::string &name) const; +template <> MAD_COMMON_EXPORT std::string XmlPacket::Entry::get(const std::string &name) const; +template <> MAD_COMMON_EXPORT const std::string& XmlPacket::Entry::get(const std::string &name) const; -template <> std::vector XmlPacket::Entry::get >(const std::string &name) const; -template <> const std::vector& XmlPacket::Entry::get&>(const std::string &name) const; +template <> MAD_COMMON_EXPORT std::vector XmlPacket::Entry::get >(const std::string &name) const; +template <> MAD_COMMON_EXPORT const std::vector& XmlPacket::Entry::get&>(const std::string &name) const; } } -- cgit v1.2.3