Merge branch 'development' of https://git01.codeplex.com/casablanca into development

unknown · unknown · commit e1c5b1c2b86f · 2015-06-08T11:09:22.000-07:00
diff --git a/Release/src/json/json.cpp b/Release/src/json/json.cpp
@@ -357,7 +357,7 @@ bool web::json::details::_String::has_escape_chars(const _String &str)
 {
     return std::any_of(std::begin(str.m_string), std::end(str.m_string), [](utility::string_t::value_type const x)
     {
-        if (x >= 0 && x <= 31) { return true; }
+        if (x <= 31) { return true; }
         if (x == '"') { return true; }
         if (x == '\\') { return true; }
         return false;

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ bool web::json::details::_String::has_escape_chars(const _String &str)`
`357`	`357`	`{`
`358`	`358`	`return std::any_of(std::begin(str.m_string), std::end(str.m_string), [](utility::string_t::value_type const x)`
`359`	`359`	`{`
`360`		`- if (x >= 0 && x <= 31) { return true; }`
	`360`	`+ if (x <= 31) { return true; }`
`361`	`361`	`if (x == '"') { return true; }`
`362`	`362`	`if (x == '\\') { return true; }`
`363`	`363`	`return false;`