From e1fe9e82ba7d35f749c63b33c6219c531ab08974 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Sat, 1 Aug 2015 14:58:57 -0400
Subject: [PATCH] Clean up remaining deprecated jsoncpp api usage
---
indra/newview/lltranslate.cpp | 8 ++++----
indra/newview/llwebprofile.cpp | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/indra/newview/lltranslate.cpp b/indra/newview/lltranslate.cpp
index b333c52ab2..e0bee7d9c6 100755
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -71,11 +71,11 @@ bool LLGoogleTranslationHandler::parseResponse(
std::string& err_msg) const
{
Json::Value root;
- Json::Reader reader;
-
- if (!reader.parse(body, root))
+ Json::CharReaderBuilder reader;
+ std::string errors;
+ if (!Json::parseFromStream(reader, std::istringstream(body), &root, &errors))
{
- err_msg = reader.getFormattedErrorMessages();
+ err_msg = errors;
return false;
}
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp
index ba7bf20c04..84cbdf523b 100755
--- a/indra/newview/llwebprofile.cpp
+++ b/indra/newview/llwebprofile.cpp
@@ -85,10 +85,11 @@ public:
}
Json::Value root;
- Json::Reader reader;
- if (!reader.parse(body, root))
+ Json::CharReaderBuilder reader;
+ std::string errors;
+ if (!Json::parseFromStream(reader, std::istringstream(body), &root, &errors))
{
- LL_WARNS() << "Failed to parse upload config: " << reader.getFormattedErrorMessages() << LL_ENDL;
+ LL_WARNS() << "Failed to parse upload config: " << errors << LL_ENDL;
LLWebProfile::reportImageUploadStatus(false);
return;
}
--
GitLab