External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update json.cc

Browse Source 
source updates to compile with msvc
This commit is contained in:
Felix Hufnagel 2015-02-04 14:36:09 +01:00
parent 49b5ec6331
commit 90865ccd20
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/json.cc
View File

@ -414,7 +414,7 @@ int json::get() const
switch (type_) switch (type_)
{ {
case (value_t::number): case (value_t::number):
return value_.number; return static_cast<int>(value_.number);
case (value_t::number_float): case (value_t::number_float):
return static_cast<int>(value_.number_float); return static_cast<int>(value_.number_float);
default: default:
@ -2371,7 +2371,7 @@ std::string json::parser::codePointToUTF8(unsigned int codePoint) const
{ {
// Can't be tested without direct access to this private method. // Can't be tested without direct access to this private method.
std::string errorMessage = "Invalid codePoint: "; std::string errorMessage = "Invalid codePoint: ";
errorMessage += codePoint; errorMessage += static_cast<char>(codePoint);
error(errorMessage); error(errorMessage);
} }
} }
@ -2584,6 +2584,8 @@ void json::parser::expect(const char c)
} }
#if !_MSC_VER
/*! /*!
This operator implements a user-defined string literal for JSON objects. It can This operator implements a user-defined string literal for JSON objects. It can
be used by adding \p "_json" to a string literal and returns a JSON object if be used by adding \p "_json" to a string literal and returns a JSON object if
@ -2596,3 +2598,4 @@ nlohmann::json operator "" _json(const char* s, std::size_t)
{ {
return nlohmann::json::parse(s); return nlohmann::json::parse(s);
} }
#endif