X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fcodec.h;h=1b893470c6e9462993d10953e36952b4fc08b6d1;hp=e0e0a96de235f906cda8c875963f3a1f399acf5e;hb=0f32d120e05ebc207dcd2ea733714f29795cb26b;hpb=d16185720fa344263367dbd50c61bfc8183d99a4

diff --git a/source/stringcodec/codec.h b/source/stringcodec/codec.h
index e0e0a96..1b89347 100644
--- 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() { }
 
@@ -167,12 +167,15 @@ private:
 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)); }
 };