Return -1 from decode_char if there is no input

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

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 8fc5e8339fa8b3175f948a008d55f4fb9417cde8..f61a49febc72bb8d6b36a7ce265e763a6cf574f1 100644 (file)
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -1,10 +1,10 @@
-#ifndef MSP_STRINGS_ISO646FI_H_
-#define MSP_STRINGS_ISO646FI_H_
+#ifndef MSP_STRINGCODEC_ISO646FI_H_
+#define MSP_STRINGCODEC_ISO646FI_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 class Iso646Fi: public Codec
 {
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "ISO-646-FI"; }
@@ -33,7 +33,7 @@ public:
        virtual Decoder *create_decoder(ErrorMode em = THROW_ON_ERROR) const { return new Decoder(em); }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif