summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadaf Ebrahimi <sadafebrahimi@google.com>2023-11-13 21:55:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-13 21:55:41 +0000
commit9f4ceb8172371dbc935679cd3e732eb7fd3b35c9 (patch)
tree85bdf3bbdaa722b75653a0cd906176f296864224
parent185de3061a4078831bc8368cfc6ef8346907054e (diff)
parent0e6863298694b6be2cbaef59cd43e10f3c56ccd1 (diff)
downloadparameter-framework-9f4ceb8172371dbc935679cd3e732eb7fd3b35c9.tar.gz
Make more xmlError structs constant am: 0e68632986
Original change: https://android-review.googlesource.com/c/platform/external/parameter-framework/+/2828272 Change-Id: I422c648422eeb3805a65dcadba5d1122dacedbfb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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;