From eebf7517517318b4cde72213be386f239bf72499 Mon Sep 17 00:00:00 2001
From: AgCaliva <ramiel1390@gmail.com>
Date: Wed, 30 Aug 2023 17:59:41 -0300
Subject: [PATCH] fix merge

---
 src/Base/Parameter.cpp | 15 +++------------
 src/Base/Parameter.h   | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp
index b35be01f32..284dbedc5f 100644
--- a/src/Base/Parameter.cpp
+++ b/src/Base/Parameter.cpp
@@ -64,23 +64,14 @@ using namespace Base;
 //**************************************************************************
 //**************************************************************************
 // private classes declaration:
-// - DOMTreeErrorReporter
 // - StrX
 // - DOMPrintFilter
 // - DOMPrintErrorHandler
 // - XStr
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-class DOMTreeErrorReporter : public ErrorHandler
-{
-public:
-    // -----------------------------------------------------------------------
-    //  Constructors and Destructor
-    // -----------------------------------------------------------------------
-    DOMTreeErrorReporter() :
-            fSawErrors(false) {
-    }
+DOMTreeErrorReporter::DOMTreeErrorReporter():
+	fSawErrors(false) {
+}
 
 void DOMTreeErrorReporter::warning(const SAXParseException&)
 {
diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h
index c9adbce0cd..2c9ba62f86 100644
--- a/src/Base/Parameter.h
+++ b/src/Base/Parameter.h
@@ -430,6 +430,39 @@ private:
     ~ParameterManager() override;
 };
 
+XERCES_CPP_NAMESPACE_USE
+
+class DOMTreeErrorReporter : public ErrorHandler
+{
+public:
+    // -----------------------------------------------------------------------
+    //  Constructors and Destructor
+    // -----------------------------------------------------------------------
+	DOMTreeErrorReporter();
+    ~DOMTreeErrorReporter() override = default;
+    // -----------------------------------------------------------------------
+    //  Implementation of the error handler interface
+    // -----------------------------------------------------------------------
+    void warning(const SAXParseException& toCatch) override;
+    void error(const SAXParseException& toCatch) override;
+    void fatalError(const SAXParseException& toCatch) override;
+    void resetErrors() override;
+    // -----------------------------------------------------------------------
+    //  Getter methods
+    // -----------------------------------------------------------------------
+    bool getSawErrors() const;
+private:
+	// -----------------------------------------------------------------------
+    //  Private data members
+    //
+    //  fSawErrors
+    //      This is set if we get any errors, and is queryable via a getter
+    //      method. Its used by the main code to suppress output if there are
+    //      errors.
+    // -----------------------------------------------------------------------
+	bool fSawErrors;
+};
+
 
 /** python wrapper function
 */