Add move semantics to Variant

[libs/core.git] / source / stringcodec / ascii.h

diff --git a/source/stringcodec/ascii.h b/source/stringcodec/ascii.h
index 91f903115e3497e46a54516b9335ac9993523c75..755edebce30995cd98baff4102ece87ec2f9e753 100644 (file)
--- a/source/stringcodec/ascii.h
+++ b/source/stringcodec/ascii.h
@@ -1,36 +1,36 @@
 #ifndef MSP_STRINGCODEC_ASCII_H_
 #define MSP_STRINGCODEC_ASCII_H_
 
+#include <msp/core/mspcore_api.h>
 #include "codec.h"
 
 namespace Msp {
 namespace StringCodec {
 
-class Ascii: public Codec
+class MSPCORE_API Ascii: public StandardCodec<Ascii>
 {
 public:
-       class Encoder: public Codec::Encoder
+       class MSPCORE_API Encoder: public Codec::Encoder
        {
        public:
-               Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
+               Encoder(ErrorMode em = DEFAULT): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               void encode_char(unichar, std::string &) override;
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               void transliterate(unichar, std::string &) override;
        };
 
-       class Decoder: public Codec::Decoder
+       class MSPCORE_API Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               unichar decode_char(const std::string &, std::string::const_iterator &) override;
        };
 
-       virtual const char *get_name() const { return "ASCII"; }
+       Ascii(ErrorMode em = DEFAULT): StandardCodec<Ascii>(em) { }
 
-       virtual Encoder *create_encoder(ErrorMode em = THROW_ON_ERROR) const { return new Encoder(em); }
-       virtual Decoder *create_decoder(ErrorMode em = THROW_ON_ERROR) const { return new Decoder(em); }
+       const char *get_name() const override { return "ASCII"; }
 };
 
 } // namespace StringCodec