@@ 60,9 60,9 @@ namespace core { namespace json {
 	bool Tokenizer::rest_is(std::wstring_view text) {
 		assert(text.size() <= 10); // Compare is too long
 		wchar_t rest[10];
-		_in.read(rest, make_signed(std::min<size_t>(text.size(), 10)));
-		std::streamsize read_chars = make_signed(_in.gcount());
-		if (read_chars < text.size())
+		_in.read(rest, sign_cast(std::min<size_t>(text.size(), 10)));
+		std::streamsize read_chars = _in.gcount();
+		if (unsign_cast(read_chars) < text.size())
 			return false;
 		return std::memcmp(text.data(), rest, text.size()*sizeof(wchar_t)) == 0;
 	}