@@ 7,24 7,24 @@ namespace core
 
 namespace
 {
-	ErrorLevel __error_level = ErrorLevel::Errors;
-	std::ostream *__null_ostream = nullptr; ///< This is a stream that will get a bad state and not output anything.
+	ErrorLevel error_level = ErrorLevel::Errors;
+	std::ostream *null_ostream = nullptr; ///< This is a stream that will get a bad state and not output anything.
 }
 
 LogScope::LogScope()
 {
-	__null_ostream = new std::ostream(nullptr);
+	null_ostream = new std::ostream(nullptr);
 }
 
 LogScope::~LogScope()
 {
-	delete __null_ostream;
-	__null_ostream = nullptr;
+	delete null_ostream;
+	null_ostream = nullptr;
 }
 
 void set_log_level(ErrorLevel level)
 {
-	__error_level = level;
+	error_level = level;
 }
 
 std::ostream &error()

          
@@ 34,22 34,22 @@ std::ostream &error()
 
 std::ostream &warning()
 {
-	if (__error_level < ErrorLevel::Warnings)
-		return *__null_ostream;
+	if (error_level < ErrorLevel::Warnings)
+		return *null_ostream;
 	return std::cout;
 }
 
 std::ostream &info()
 {
-	if (__error_level < ErrorLevel::Info)
-		return *__null_ostream;
+	if (error_level < ErrorLevel::Info)
+		return *null_ostream;
 	return std::cout;
 }
 
 std::ostream &debug()
 {
-	if (__error_level < ErrorLevel::Debug)
-		return *__null_ostream;
+	if (error_level < ErrorLevel::Debug)
+		return *null_ostream;
 	return std::cout;
 }
 

          

@@ 236,7 236,7 @@ namespace core { namespace json {
 		while(true) {
 			read_next_char();
 			if (is_digit()) {
-				decimals += multiplier * (_char - L'0');
+				decimals += multiplier * float(_char - L'0');
 			} else if (_char == L'e') {
 				float exponent = 0.0f;
 				parse_exponent(exponent);

          

@@ 2,6 2,7 @@ 
 
 #include <algorithm>
 #include <core/json/json_tokenizer.h>
+#include <core/math/sign.h>
 #include <cstring>
 
 namespace core { namespace json {

          
@@ 59,8 60,8 @@ 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, std::min<size_t>(text.size(), 10));
-		std::streamsize read_chars = _in.gcount();
+		_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())
 			return false;
 		return std::memcmp(text.data(), rest, text.size()*sizeof(wchar_t)) == 0;

          

@@ 5,7 5,7 @@ namespace core {
 	/// \addtogroup file
 	/// \{
 
-	/// Ths class consumes utf8 characters and keeps track of the line and
+	/// This class consumes utf8 characters and keeps track of the line and
 	/// column based on what is sent to it.
 	class LineCounter
 	{