From ccc4d6033b920848decc65451843f1f82bae4e9e Mon Sep 17 00:00:00 2001 From: AgCaliva Date: Thu, 31 Aug 2023 12:38:31 -0300 Subject: [PATCH] Trying to solve header issues in windows. --- src/Base/DocumentReader.cpp | 10 ++++++---- src/Base/DocumentReader.h | 15 ++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/Base/DocumentReader.cpp b/src/Base/DocumentReader.cpp index 01d18e5275..b4245d58eb 100644 --- a/src/Base/DocumentReader.cpp +++ b/src/Base/DocumentReader.cpp @@ -34,10 +34,12 @@ #endif #include -//#ifndef _PreComp_ +#ifndef _PreComp_ //# include -//# include -//#endif +# include +# include +# include +#endif #ifdef _MSC_VER # define strdup _strdup @@ -182,7 +184,7 @@ XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *DocumentReader::FindElement(XERCES_CP return nullptr; } -XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *DocumentReader::FindNextElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *Prev, const char* Type) const +XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *DocumentReader::FindNextElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *Prev, const char* Type) const { if (!Prev || !Type) return nullptr; diff --git a/src/Base/DocumentReader.h b/src/Base/DocumentReader.h index 4fdcc59193..ff7d6b14ce 100644 --- a/src/Base/DocumentReader.h +++ b/src/Base/DocumentReader.h @@ -28,14 +28,15 @@ #include #include #include -//#include -//#include "FileInfo.h"//remplaced: #include -#ifndef _PreComp_ -# include -# include -#endif +//#ifndef _PreComp_ +//# include +//# include +//#endif + + +#include namespace zipios { class ZipInputStream; @@ -71,7 +72,7 @@ public: XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *FindElementByField(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* Start, const char* TypeEl,const char* field_name, const char* field_value) const; - XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *FindNextElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *Prev, const char* Type) const; + XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *FindNextElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement *Prev, const char* Type) const; static long ContentToASCII(const char* Content);