summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadaf Ebrahimi <sadafebrahimi@google.com>2023-11-13 18:27:34 +0000
committerSadaf Ebrahimi <sadafebrahimi@google.com>2023-11-13 18:27:34 +0000
commit0e6863298694b6be2cbaef59cd43e10f3c56ccd1 (patch)
tree85bdf3bbdaa722b75653a0cd906176f296864224
parent185de3061a4078831bc8368cfc6ef8346907054e (diff)
downloadparameter-framework-0e6863298694b6be2cbaef59cd43e10f3c56ccd1.tar.gz
Make more xmlError structs constant
parameter-framework's upstream is not active anymore so we can't send this patch upstream. github.com/GNOME/libxml2/commit/4547061 is causing an error in parameter-framework. Test: TreeHugger Change-Id: Ib7b155f5b7bbbbe539e5e8939ccc53c4d178d09c
-rw-r--r--upstream/xmlserializer/XmlSerializingContext.cpp2
-rw-r--r--upstream/xmlserializer/XmlSerializingContext.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/upstream/xmlserializer/XmlSerializingContext.cpp b/upstream/xmlserializer/XmlSerializingContext.cpp
index 0b08bab..f03d9a0 100644
--- a/upstream/xmlserializer/XmlSerializingContext.cpp
+++ b/upstream/xmlserializer/XmlSerializingContext.cpp
@@ -55,7 +55,7 @@ void CXmlSerializingContext::appendLineToError(const std::string &strAppend)
* @param[in] error the xml error
*
*/
-void CXmlSerializingContext::structuredErrorHandler(void *userData, xmlErrorPtr error)
+void CXmlSerializingContext::structuredErrorHandler(void *userData, const xmlError *error)
{
CXmlSerializingContext *self = static_cast<CXmlSerializingContext *>(userData);
diff --git a/upstream/xmlserializer/XmlSerializingContext.h b/upstream/xmlserializer/XmlSerializingContext.h
index fefa9d0..3927827 100644
--- a/upstream/xmlserializer/XmlSerializingContext.h
+++ b/upstream/xmlserializer/XmlSerializingContext.h
@@ -61,7 +61,7 @@ public:
* @param[in] error the xml error output format
*
*/
- static void structuredErrorHandler(void *userData, _xmlError *error);
+ static void structuredErrorHandler(void *userData, const _xmlError *error);
private:
std::string _strXmlError;