Let the base classes decide the default error mode

diff --git a/source/stringcodec/ascii.h b/source/stringcodec/ascii.h
index b052727b4cd33c18ef816fbff53519645b869acc..69804942b08eae42b5dff3620f2394da10c85ff7 100644 (file)
--- a/source/stringcodec/ascii.h
+++ b/source/stringcodec/ascii.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       Ascii(ErrorMode em = THROW_ON_ERROR): StandardCodec<Ascii>(em) { }
+       Ascii(ErrorMode em = DEFAULT): StandardCodec<Ascii>(em) { }
 
        virtual const char *get_name() const { return "ASCII"; }
 };

diff --git a/source/stringcodec/codec.cpp b/source/stringcodec/codec.cpp
index d1fc1dfb0730adbfc94e5c2c7d50335172596cf8..865d9c7de1cca44e64e64c0dccab8ad49c5a8c0b 100644 (file)
--- a/source/stringcodec/codec.cpp
+++ b/source/stringcodec/codec.cpp
@@ -74,7 +74,7 @@ Codec *create_codec(const string &n)
                        name += *i;
        }
 
-       ErrorMode em = THROW_ON_ERROR;
+       ErrorMode em = DEFAULT;
        if(i!=n.end() && *i==':')
        {
                string em_str(i+1, n.end());

diff --git a/source/stringcodec/codec.h b/source/stringcodec/codec.h
index e0e0a96de235f906cda8c875963f3a1f399acf5e..d0871ff119ab563ea2ff000ece006c55577ddf48 100644 (file)
--- a/source/stringcodec/codec.h
+++ b/source/stringcodec/codec.h
@@ -41,7 +41,7 @@ public:
        protected:
                ErrorMode err_mode;
 
-               Encoder(ErrorMode em): err_mode(em) { }
+               Encoder(ErrorMode em): err_mode(em==DEFAULT ? THROW_ON_ERROR : em) { }
        public:
                virtual ~Encoder() { }
 
@@ -92,7 +92,7 @@ public:
        protected:
                ErrorMode err_mode;
 
-               Decoder(ErrorMode em): err_mode(em) { }
+               Decoder(ErrorMode em): err_mode(em==DEFAULT ? THROW_ON_ERROR : em) { }
        public:
                virtual ~Decoder() { }
 

diff --git a/source/stringcodec/iso2022jp.h b/source/stringcodec/iso2022jp.h
index a3f425a95d9c9dd1ddf4a215cdd7454aa3d838a9..aa5c78b9d4de5bf23a2428c1cdffde7013ab0537 100644 (file)
--- a/source/stringcodec/iso2022jp.h
+++ b/source/stringcodec/iso2022jp.h
@@ -22,7 +22,7 @@ public:
                Mode mode;
 
        public:
-               Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em), mode(ASCII) { }
+               Encoder(ErrorMode em = DEFAULT): Codec::Encoder(em), mode(ASCII) { }
 
                virtual void encode_char(unichar, std::string &);
                virtual void sync(std::string &);
@@ -39,7 +39,7 @@ public:
                Codec::Decoder *dec;
 
        public:
-               Decoder(ErrorMode =THROW_ON_ERROR);
+               Decoder(ErrorMode = DEFAULT);
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
                virtual void reset();
@@ -47,7 +47,7 @@ public:
                void switch_mode(Mode);
        };
 
-       Iso2022Jp(ErrorMode em = THROW_ON_ERROR): StandardCodec<Iso2022Jp>(em) { }
+       Iso2022Jp(ErrorMode em = DEFAULT): StandardCodec<Iso2022Jp>(em) { }
 
        virtual const char *get_name() const { return "ISO-2022-JP"; }
 };

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 7ded23cc734f2d89cedce5f0259fbeca7fca109d..2266c2ca06f24a081d34d3abe7be009f67b95cf0 100644 (file)
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       Iso646Fi(ErrorMode em = THROW_ON_ERROR): StandardCodec<Iso646Fi>(em) { }
+       Iso646Fi(ErrorMode em = DEFAULT): StandardCodec<Iso646Fi>(em) { }
 
        virtual const char *get_name() const { return "ISO-646-FI"; }
 };

diff --git a/source/stringcodec/iso88591.h b/source/stringcodec/iso88591.h
index 5c59fae5f9eccbdce443765e620ea345271854fd..2b5a624612d74c29da30b44f166f0713220147e2 100644 (file)
--- a/source/stringcodec/iso88591.h
+++ b/source/stringcodec/iso88591.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       Iso88591(ErrorMode em = THROW_ON_ERROR): StandardCodec<Iso88591>(em) { }
+       Iso88591(ErrorMode em = DEFAULT): StandardCodec<Iso88591>(em) { }
 
        virtual const char *get_name() const { return "ISO-8859-1"; }
 };

diff --git a/source/stringcodec/iso885915.h b/source/stringcodec/iso885915.h
index 5d6573043ce61a3950c0eaeeda546c7dd632c30a..ffb3c9a944beff8dab608eaadf23387a76940c7b 100644 (file)
--- a/source/stringcodec/iso885915.h
+++ b/source/stringcodec/iso885915.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       Iso885915(ErrorMode em = THROW_ON_ERROR): StandardCodec<Iso885915>(em) { }
+       Iso885915(ErrorMode em = DEFAULT): StandardCodec<Iso885915>(em) { }
 
        virtual const char *get_name() const { return "ISO-8859-15"; }
 };

diff --git a/source/stringcodec/jisx0201.h b/source/stringcodec/jisx0201.h
index 5521d01e8b002bf6a8303900b7a0b0eac8eb9136..1e7c8ef2e70d4741b91f964ef6b9353e6e19f5a9 100644 (file)
--- a/source/stringcodec/jisx0201.h
+++ b/source/stringcodec/jisx0201.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       JisX0201(ErrorMode em = THROW_ON_ERROR): StandardCodec<JisX0201>(em) { }
+       JisX0201(ErrorMode em = DEFAULT): StandardCodec<JisX0201>(em) { }
 
        virtual const char *get_name() const { return "JIS X 0201"; }
 };

diff --git a/source/stringcodec/jisx0208.h b/source/stringcodec/jisx0208.h
index c8e69446b615084fb7406d9a7880225181ecfd62..293d2774304d1c27a41c061f9801e76a50260b22 100644 (file)
--- a/source/stringcodec/jisx0208.h
+++ b/source/stringcodec/jisx0208.h
@@ -17,7 +17,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -27,12 +27,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       JisX0208(ErrorMode em = THROW_ON_ERROR): StandardCodec<JisX0208>(em) { }
+       JisX0208(ErrorMode em = DEFAULT): StandardCodec<JisX0208>(em) { }
 
        virtual const char *get_name() const { return "JIS X 0208"; }
 };

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index fcf23eff35e55e0a03532f9e9b541ea2ac4a6414..94c627ec5a0ca0f905eac01ea4a4de4ef35fb934 100644 (file)
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       Utf8(ErrorMode em = THROW_ON_ERROR): StandardCodec<Utf8>(em) { }
+       Utf8(ErrorMode em = DEFAULT): StandardCodec<Utf8>(em) { }
 
        virtual const char *get_name() const { return "UTF-8"; }
 };

diff --git a/source/stringcodec/windows1252.h b/source/stringcodec/windows1252.h
index 44d97c9f14931972c0dec03ba91706d9d7d3d542..c5d140fe06347d5d06f6d2aa44dbd1aafd78ab71 100644 (file)
--- a/source/stringcodec/windows1252.h
+++ b/source/stringcodec/windows1252.h
@@ -12,7 +12,7 @@ public:
        class 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(unichar, std::string &);
        private:
@@ -22,12 +22,12 @@ public:
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
                virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       Windows1252(ErrorMode em = THROW_ON_ERROR): StandardCodec<Windows1252>(em) { }
+       Windows1252(ErrorMode em = DEFAULT): StandardCodec<Windows1252>(em) { }
 
        virtual const char *get_name() const { return "Windows-1252"; }
 };