Additional adjustments for Poller

[libs/core.git] / source / stringcodec / iso88591.cpp

diff --git a/source/stringcodec/iso88591.cpp b/source/stringcodec/iso88591.cpp
index cdb5f484a2f7532d1987828971dc37336c69f83e..a21b6f15d6601e04be4cbeb7100218a5308cc90b 100644 (file)
--- a/source/stringcodec/iso88591.cpp
+++ b/source/stringcodec/iso88591.cpp
@@ -8,7 +8,7 @@ namespace StringCodec {
 void Iso88591::Encoder::encode_char(unichar ch, string &buf)
 {
        if(ch<0 || ch>0xFF)
-               return error(ch, buf, "Can't express character in ISO-8859-1");
+               return error(ch, buf, invalid_character(ch, "ISO-8859-1"));
 
        buf += ch;
 }
@@ -22,7 +22,7 @@ void Iso88591::Encoder::transliterate(unichar, string &buf)
 unichar Iso88591::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
-               return error("No input");
+               return -1;
 
        return static_cast<unsigned char>(*i++);
 }