diff OrthancStone/Sources/Oracle/OrthancRestApiCommand.cpp @ 1737:ef2f56c0311c

remove calls to deprecated classes of JsonCpp
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 Dec 2020 09:16:42 +0100
parents 59f95b9ea858
children 9ac2a65d4172
line wrap: on
line diff
--- a/OrthancStone/Sources/Oracle/OrthancRestApiCommand.cpp	Tue Dec 22 09:06:33 2020 +0100
+++ b/OrthancStone/Sources/Oracle/OrthancRestApiCommand.cpp	Tue Dec 22 09:16:42 2020 +0100
@@ -24,21 +24,14 @@
 
 #include <Logging.h>
 #include <OrthancException.h>
+#include <Toolbox.h>
 
-#ifdef _MSC_VER
-// 'Json::Reader': Use CharReader and CharReaderBuilder instead
-#pragma warning(disable:4996)
-#endif
-
-#include <json/reader.h>
-#include <json/writer.h>
 
 namespace OrthancStone
 {
   void OrthancRestApiCommand::SuccessMessage::ParseJsonBody(Json::Value& target) const
   {
-    Json::Reader reader;
-    if (!reader.parse(answer_, target))
+    if (!Orthanc::Toolbox::ReadJson(target, answer_))
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
     }
@@ -56,8 +49,7 @@
 
   void OrthancRestApiCommand::SetBody(const Json::Value& json)
   {
-    Json::FastWriter writer;
-    body_ = writer.write(json);
+    Orthanc::Toolbox::WriteFastJson(body_, json);
   }