mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-15 03:21:09 +01:00
fix toJSON function and some VS warnings
This commit is contained in:
parent
2be0661a0b
commit
68fedf3136
@ -75,7 +75,7 @@ void toJSON(const std::string& value, std::ostream& out, bool wrap)
|
||||
}
|
||||
|
||||
|
||||
std::string toJSON(const std::string& value, bool wrap, bool escapeAllUnicode)
|
||||
std::string toJSON(const std::string& value, bool wrap)
|
||||
{
|
||||
int options = (wrap ? Poco::JSON_WRAP_STRINGS : 0);
|
||||
std::string ret;
|
||||
|
@ -27,7 +27,7 @@ namespace JSON {
|
||||
|
||||
void Stringifier::stringify(const Var& any, std::ostream& out, unsigned int indent, int step, int options)
|
||||
{
|
||||
bool escapeUnicode = options & Poco::JSON_ESCAPE_UNICODE;
|
||||
bool escapeUnicode = ((options & Poco::JSON_ESCAPE_UNICODE) != 0);
|
||||
|
||||
if (step == -1) step = indent;
|
||||
|
||||
|
2
openssl
2
openssl
@ -1 +1 @@
|
||||
Subproject commit 26b1673caad94a702b6d694f48f917a283b30777
|
||||
Subproject commit b42dcf2175f30e0c21dc9a684f0b9670f4ed09c8
|
Loading…
Reference in New Issue
Block a user