X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fcodec.h;h=5e67d46049078f3555994eeca393ce9691bf75f8;hp=e0e0a96de235f906cda8c875963f3a1f399acf5e;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=d16185720fa344263367dbd50c61bfc8183d99a4

diff --git a/source/stringcodec/codec.h b/source/stringcodec/codec.h
index e0e0a96..5e67d46 100644
--- a/source/stringcodec/codec.h
+++ b/source/stringcodec/codec.h
@@ -39,11 +39,11 @@ public:
 	class Encoder
 	{
 	protected:
-		ErrorMode err_mode;
+		ErrorMode err_mode = THROW_ON_ERROR;
 
-		Encoder(ErrorMode em): err_mode(em) { }
+		Encoder(ErrorMode em): err_mode(em==DEFAULT ? THROW_ON_ERROR : em) { }
 	public:
-		virtual ~Encoder() { }
+		virtual ~Encoder() = default;
 
 		/** Encodes a single unicode character.  If the character can't be
 		represented in this encoding, error() should be called. */
@@ -90,11 +90,11 @@ public:
 	class Decoder
 	{
 	protected:
-		ErrorMode err_mode;
+		ErrorMode err_mode = THROW_ON_ERROR;
 
-		Decoder(ErrorMode em): err_mode(em) { }
+		Decoder(ErrorMode em): err_mode(em==DEFAULT ? THROW_ON_ERROR : em) { }
 	public:
-		virtual ~Decoder() { }
+		virtual ~Decoder() = default;
 
 		/** Decodes a single character from a string.  The iterator is advanced
 		to the next character.  For stateful codecs, -1 may be returned if a
@@ -131,9 +131,9 @@ public:
 	};
 
 protected:
-	Codec() { }
+	Codec() = default;
 public:
-	virtual ~Codec() { }
+	virtual ~Codec() = default;
 
 	/** Returns the name of the encoding handled by this codec. */
 	virtual const char *get_name() const = 0;
@@ -162,17 +162,20 @@ template<typename C>
 class StandardCodec: public Codec
 {
 private:
-	ErrorMode err_mode;
+	ErrorMode err_mode = THROW_ON_ERROR;
 
 protected:
 	StandardCodec(ErrorMode em): err_mode(em==DEFAULT ? THROW_ON_ERROR : em) { }
 
+	ErrorMode get_error_mode(ErrorMode em = DEFAULT) const
+	{ return (em==DEFAULT ? err_mode : em); }
+
 public:
-	virtual Encoder *create_encoder(ErrorMode em = DEFAULT) const
-	{ return new typename C::Encoder(em==DEFAULT ? err_mode : em); }
+	Encoder *create_encoder(ErrorMode em = DEFAULT) const override
+	{ return new typename C::Encoder(get_error_mode(em)); }
 
-	virtual Decoder *create_decoder(ErrorMode em = DEFAULT) const
-	{ return new typename C::Decoder(em==DEFAULT ? err_mode : em); }
+	Decoder *create_decoder(ErrorMode em = DEFAULT) const override
+	{ return new typename C::Decoder(get_error_mode(em)); }
 };