X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fcodec.h;h=efa165784ac2988f674c0c6be5794c3a1a44c63d;hb=122846f0881673770d88eff7d925ecf25c01b62e;hp=e0e0a96de235f906cda8c875963f3a1f399acf5e;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

diff --git a/source/stringcodec/codec.h b/source/stringcodec/codec.h
index e0e0a96..efa1657 100644
--- a/source/stringcodec/codec.h
+++ b/source/stringcodec/codec.h
@@ -39,9 +39,9 @@ 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() { }
 
@@ -90,9 +90,9 @@ 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() { }
 
@@ -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); }
+	{ 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); }
+	{ return new typename C::Decoder(get_error_mode(em)); }
 };