Mercurial > hg > orthanc-webviewer

changeset 148:4217644ac904

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:16:28 +0100
parents 70d1fe6d6309
children 8189115c0da5
files Orthanc/Core/PrecompiledHeaders.h Orthanc/Core/Toolbox.cpp Orthanc/Core/Toolbox.h
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Orthanc/Core/PrecompiledHeaders.h	Wed Nov 09 12:43:58 2016 +0100
+++ b/Orthanc/Core/PrecompiledHeaders.h	Wed Nov 09 14:16:28 2016 +0100
@@ -48,7 +48,7 @@
 
 #include <json/value.h>
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
 #include <pugixml.hpp>
 #endif
 
--- a/Orthanc/Core/Toolbox.cpp	Wed Nov 09 12:43:58 2016 +0100
+++ b/Orthanc/Core/Toolbox.cpp	Wed Nov 09 14:16:28 2016 +0100
@@ -103,7 +103,7 @@
 #endif
 
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
 #include "ChunkedBuffer.h"
 #include <pugixml.hpp>
 #endif
@@ -1207,7 +1207,7 @@
 #endif
 
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
   class ChunkedBufferWriter : public pugi::xml_writer
   {
   private:
--- a/Orthanc/Core/Toolbox.h	Wed Nov 09 12:43:58 2016 +0100
+++ b/Orthanc/Core/Toolbox.h	Wed Nov 09 14:16:28 2016 +0100
@@ -198,7 +198,7 @@
     bool IsExistingFile(const std::string& path);
 #endif
 
-#if ORTHANC_PUGIXML_ENABLED == 1
+#if ORTHANC_ENABLE_PUGIXML == 1
     void JsonToXml(std::string& target,
                    const Json::Value& source,
                    const std::string& rootElement = "root",