fixed GH pocoproject#138: FreeBSD JSON tests fail

aleks-f · aleks-f · commit 83ad8b36f504 · 2013-06-02T23:36:36.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -75,6 +75,8 @@ Release 1.5.2 (2013-06-xx)
 - fixed GH #198: The "application.configDir" property is not always created.
 - fixed GH #185: Poco::NumberFormatter::format(double value, int precision) 
   ignore precision == 0
+- fixed GH #138: FreeBSD JSON tests fail
+
 
 Release 1.5.1 (2013-01-11)
 ==========================
diff --git a/Foundation/include/Poco/Platform_POSIX.h b/Foundation/include/Poco/Platform_POSIX.h
@@ -81,7 +81,7 @@
 // http://dbp-consulting.com/tutorials/SuppressingGCCWarnings.html
 // use example: GCC_DIAG_OFF(unused-variable)
 // 
-#if defined(POCO_COMPILER_GCC) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 402)
+#if defined(POCO_COMPILER_GCC) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 460)
 
 	#ifdef GCC_DIAG_OFF
 		#undef GCC_DIAG_OFF
diff --git a/Foundation/testsuite/src/UnicodeConverterTest.cpp b/Foundation/testsuite/src/UnicodeConverterTest.cpp
@@ -91,4 +91,5 @@ CppUnit::Test* UnicodeConverterTest::suite()
 }
 
 
-#endif
+#endif
+
diff --git a/JSON/include/Poco/JSON/Parser.h b/JSON/include/Poco/JSON/Parser.h
@@ -335,14 +335,14 @@ class JSON_API Parser
 		unsigned char ch = static_cast<unsigned char>(CharTraits::to_char_type(nextChar));
 
 		// Determine the character's class.
-		if (ch < 0 || (!_allowNullByte && ch == 0)) return false;
-		if (0x80 <= ch && ch <= 0xFF)
+		if ((!_allowNullByte && ch == 0)) return false;
+		if (ch >= 0x80)
 		{
 			nextClass = C_ETC;
 			CharIntType count = utf8CheckFirst(nextChar);
 			if (!count)
 			{
-				throw Poco::JSON::JSONException(format("Unable to decode byte 0x%x", (unsigned int) nextChar));
+				throw Poco::JSON::JSONException("Bad character.");
 			}
 
 			char buffer[4];

Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,5 @@ CppUnit::Test* UnicodeConverterTest::suite()`
`91`	`91`	`}`
`92`	`92`
`93`	`93`
`94`		`-#endif`
	`94`	`+#endif`
	`95`	`+`
Original file line number	Diff line number	Diff line change
`@@ -335,14 +335,14 @@ class JSON_API Parser`
`335`	`335`	`unsigned char ch = static_cast<unsigned char>(CharTraits::to_char_type(nextChar));`
`336`	`336`
`337`	`337`	`// Determine the character's class.`
`338`		`- if (ch < 0 \|\| (!_allowNullByte && ch == 0)) return false;`
`339`		`- if (0x80 <= ch && ch <= 0xFF)`
	`338`	`+ if ((!_allowNullByte && ch == 0)) return false;`
	`339`	`+ if (ch >= 0x80)`
`340`	`340`	`{`
`341`	`341`	`nextClass = C_ETC;`
`342`	`342`	`CharIntType count = utf8CheckFirst(nextChar);`
`343`	`343`	`if (!count)`
`344`	`344`	`{`
`345`		`- throw Poco::JSON::JSONException(format("Unable to decode byte 0x%x", (unsigned int) nextChar));`
	`345`	`+ throw Poco::JSON::JSONException("Bad character.");`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`char buffer[4];`