X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fjisx0208.h;h=b0c03b2af8136593a2e9d26cc882c8596d20f1c9;hp=c8e69446b615084fb7406d9a7880225181ecfd62;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848

diff --git a/source/stringcodec/jisx0208.h b/source/stringcodec/jisx0208.h
index c8e6944..b0c03b2 100644
--- a/source/stringcodec/jisx0208.h
+++ b/source/stringcodec/jisx0208.h
@@ -17,35 +17,33 @@ 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 &);
+		void encode_char(unichar, std::string &) override;
 	private:
-		virtual void transliterate(unichar, std::string &);
+		void transliterate(unichar, std::string &) override;
 	};
 
 	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 &);
+		unichar decode_char(const std::string &, std::string::const_iterator &) override;
 	};
 
-	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"; }
+	const char *get_name() const override { return "JIS X 0208"; }
 };
 
 
 struct Kuten
 {
-	unsigned short ku;
-	unsigned short ten;
+	unsigned short ku = 0;
+	unsigned short ten = 0;
 
-	Kuten(): ku(0), ten(0) { }
-
-	operator bool() { return ku!=0 && ten!=0; }
+	explicit operator bool() { return ku!=0 && ten!=0; }
 };
 
 unichar jisx0208_to_ucs(Kuten);