X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fjisx0208.h;h=ee7b6878fb9279def214fd7c3c56b4ad325c4e87;hb=122846f0881673770d88eff7d925ecf25c01b62e;hp=c59e44f5481ec32e234f41a6b12b306e248b0bf8;hpb=d3fc0bf0f20f100f2831188c1ce21461d21c2c7a;p=libs%2Fcore.git

diff --git a/source/stringcodec/jisx0208.h b/source/stringcodec/jisx0208.h
index c59e44f..ee7b687 100644
--- 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"; }
 };
@@ -40,16 +40,14 @@ public:
 
 struct Kuten
 {
-	unsigned short ku;
-	unsigned short ten;
-
-	Kuten(): ku(0), ten(0) { }
+	unsigned short ku = 0;
+	unsigned short ten = 0;
 
 	operator bool() { return ku!=0 && ten!=0; }
 };
 
-extern unichar jisx0208_to_ucs(Kuten);
-extern Kuten ucs_to_jisx0208(unichar);
+unichar jisx0208_to_ucs(Kuten);
+Kuten ucs_to_jisx0208(unichar);
 
 } // namespace StringCodec
 } // namespace Msp