diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2023-11-13 22:59:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-13 22:59:58 +0000 |
| commit | 72de54457e9bef2547ec78f78cae4d0d42e23d71 (patch) | |
| tree | 85bdf3bbdaa722b75653a0cd906176f296864224 | |
| parent | 185de3061a4078831bc8368cfc6ef8346907054e (diff) | |
| parent | 63e9e40b98f605a5cc1f7c55a5e3a0aa9381e04f (diff) | |
| download | parameter-framework-72de54457e9bef2547ec78f78cae4d0d42e23d71.tar.gz | |
Make more xmlError structs constant am: 0e68632986 am: 9f4ceb8172 am: 63e9e40b98
Original change: https://android-review.googlesource.com/c/platform/external/parameter-framework/+/2828272
Change-Id: I592aaff892a33e06610e34d8b378cf02c0d53d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | upstream/xmlserializer/XmlSerializingContext.cpp | 2 | ||||
| -rw-r--r-- | upstream/xmlserializer/XmlSerializingContext.h | 2 |
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; |