From fac2437fabf24ff56df7ded9f468d3d855058221 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Thu, 8 Feb 2018 19:23:15 -0600 Subject: [PATCH] fix toJSON function and some VS warnings --- Foundation/src/JSONString.cpp | 2 +- JSON/src/Stringifier.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Foundation/src/JSONString.cpp b/Foundation/src/JSONString.cpp index d2591170c..71887c5d8 100644 --- a/Foundation/src/JSONString.cpp +++ b/Foundation/src/JSONString.cpp @@ -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; diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp index c82f52149..633ddf675 100644 --- a/JSON/src/Stringifier.cpp +++ b/JSON/src/Stringifier.cpp @@ -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;