clang compile

aleks-f · aleks-f · commit d8de7489d576 · 2013-06-01T16:30:02.000-05:00
diff --git a/JSON/include/Poco/JSON/Parser.h b/JSON/include/Poco/JSON/Parser.h
@@ -67,8 +67,9 @@ SOFTWARE.
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Array.h"
 #include "Poco/JSON/ParseHandler.h"
+#include "Poco/JSON/JSONException.h"
+#include "Poco/UTF8Encoding.h"
 #include "Poco/Dynamic/Var.h"
-#include "Poco/StreamTokenizer.h"
 #include <string>
 
 
@@ -341,21 +342,21 @@ class JSON_API Parser
 			CharIntType count = utf8CheckFirst(nextChar);
 			if (!count)
 			{
-				throw JSONException(format("Unable to decode byte 0x%x", (unsigned int) nextChar));
+				throw Poco::JSON::JSONException(format("Unable to decode byte 0x%x", (unsigned int) nextChar));
 			}
 
 			char buffer[4];
 			buffer[0] = nextChar;
 			for(int i = 1; i < count; ++i)
 			{
 				int c = 0;
-				if (!source.nextChar(c)) throw JSONException("Invalid UTF8 sequence found");
+				if (!source.nextChar(c)) throw Poco::JSON::JSONException("Invalid UTF8 sequence found");
 				buffer[i] = c;
 			}
 		
-			if (!UTF8Encoding::isLegal((unsigned char*) buffer, count))
+			if (!Poco::UTF8Encoding::isLegal((unsigned char*) buffer, count))
 			{
-				throw JSONException("No legal UTF8 found");
+				throw Poco::JSON::JSONException("No legal UTF8 found");
 			}
 
 			for(int i = 0; i < count; ++i)

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,9 @@ SOFTWARE.`
`67`	`67`	`#include "Poco/JSON/Object.h"`
`68`	`68`	`#include "Poco/JSON/Array.h"`
`69`	`69`	`#include "Poco/JSON/ParseHandler.h"`
	`70`	`+#include "Poco/JSON/JSONException.h"`
	`71`	`+#include "Poco/UTF8Encoding.h"`
`70`	`72`	`#include "Poco/Dynamic/Var.h"`
`71`		`-#include "Poco/StreamTokenizer.h"`
`72`	`73`	`#include <string>`
`73`	`74`
`74`	`75`
`@@ -341,21 +342,21 @@ class JSON_API Parser`
`341`	`342`	`CharIntType count = utf8CheckFirst(nextChar);`
`342`	`343`	`if (!count)`
`343`	`344`	`{`
`344`		`- throw JSONException(format("Unable to decode byte 0x%x", (unsigned int) nextChar));`
	`345`	`+ throw Poco::JSON::JSONException(format("Unable to decode byte 0x%x", (unsigned int) nextChar));`
`345`	`346`	`}`
`346`	`347`
`347`	`348`	`char buffer[4];`
`348`	`349`	`buffer[0] = nextChar;`
`349`	`350`	`for(int i = 1; i < count; ++i)`
`350`	`351`	`{`
`351`	`352`	`int c = 0;`
`352`		`- if (!source.nextChar(c)) throw JSONException("Invalid UTF8 sequence found");`
	`353`	`+ if (!source.nextChar(c)) throw Poco::JSON::JSONException("Invalid UTF8 sequence found");`
`353`	`354`	`buffer[i] = c;`
`354`	`355`	`}`
`355`	`356`
`356`		`- if (!UTF8Encoding::isLegal((unsigned char*) buffer, count))`
	`357`	`+ if (!Poco::UTF8Encoding::isLegal((unsigned char*) buffer, count))`
`357`	`358`	`{`
`358`		`- throw JSONException("No legal UTF8 found");`
	`359`	`+ throw Poco::JSON::JSONException("No legal UTF8 found");`
`359`	`360`	`}`
`360`	`361`
`361`	`362`	`for(int i = 0; i < count; ++i)`