Fixed build issues (not done yet)

One json test (to_string_escaped_chars) still fails.

Author: arturl

Release/src/json/json_parsing.cpp

@@ -810,21 +810,21 @@ bool JSON_StringParser<CharType>::CompleteStringLiteral(typename JSON_Parser<Cha
 }
 
 template <typename CharType>
-bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(Token &token)
+bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(typename JSON_Parser<CharType>::Token &token)
 {
     // This function handles parsing the string when an unescape character is encountered.
     // It is called once the part before the unescape char is copied to the token.spelling string
 
     CharType ch;
 
-    if (!handle_unescape_char(token))
+    if (!JSON_StringParser<CharType>::handle_unescape_char(token))
         return false;
 
     while ((ch = JSON_StringParser<CharType>::NextCharacter()) != '"')
     {
         if (ch == '\\')
         {
-            if (!handle_unescape_char(token))
+            if (!JSON_StringParser<CharType>::handle_unescape_char(token))
                 return false;
         }
         else
@@ -836,7 +836,7 @@ bool JSON_StringParser<CharType>::finish_parsing_string_with_unescape_char(Token
         }
     }
 
-    token.kind = Token::TKN_StringLiteral;
+    token.kind = JSON_StringParser<CharType>::Token::TKN_StringLiteral;
     token.end.m_column = this->m_currentColumn;
     token.end.m_line = this->m_currentLine;
 

Release/src/json/json_serialization.cpp

@@ -154,7 +154,7 @@ void web::json::details::_Number::format(std::basic_string<char>& stream) const
         _itoa_s(m_intval, tempBuffer, tempSize, 10);
         const auto numChars = strnlen_s(tempBuffer, tempSize);
 #else
-        const auto numChars = std::snprintf(tempBuffer, tempSize, "i", m_value);
+        const auto numChars = std::snprintf(tempBuffer, tempSize, "%i", m_intval);
 #endif
         stream.append(tempBuffer, numChars);
     }
@@ -263,7 +263,7 @@ bool web::json::details::_String::has_escape_chars(const _String &str)
 {
 	if (str.is_wide())
 	{
-		const wchar_t *escapes = L"\"\\\b\f\r\n\t";
+		const utf16char *escapes = u"\"\\\b\f\r\n\t";
 		return str.m_wstring->find_first_of(escapes) != std::wstring::npos;
 	}
 	else
@@ -382,7 +382,7 @@ bool json::value::operator==(const json::value &other) const
     case Array:
         return static_cast<const json::details::_Array*>(this->m_value.get())->is_equal(static_cast<const json::details::_Array*>(other.m_value.get()));
     }
-    return false;
+    UNREACHABLE;
 }
 
 web::json::value& web::json::value::operator [] (const utility::string_t &key)