[PFW] Integrate PFW core version 3.2.5 release

PFW 3.2.5 release notes:
https://github.com/intel/parameter-framework/releases/tag/v3.2.5

This release contains the following changes:
- CMake Package configuration file generation
- Preliminary and unofficial OSX support in Travis-CI
- Use clang-tidy for automatic code cleanup
- Some more cleanup and fixes
- Speed Travis-CI up by using CCache

Bug: 124767636
Test: build

Change-Id: Ib7ce6824430f3907c0508194e91f71a934bdcda8
Signed-off-by: Sebastien Guiriec <sebastien.guiriec@renault.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/upstream/xmlserializer/XmlSerializingContext.cpp b/upstream/xmlserializer/XmlSerializingContext.cpp
index 4666c54..0b08bab 100644
--- a/upstream/xmlserializer/XmlSerializingContext.cpp
+++ b/upstream/xmlserializer/XmlSerializingContext.cpp
@@ -40,7 +40,7 @@ CXmlSerializingContext::CXmlSerializingContext(std::string &strError)
 CXmlSerializingContext::~CXmlSerializingContext()
 {
     // TODO: restore the previous handler
-    xmlSetStructuredErrorFunc(NULL, NULL);
+    xmlSetStructuredErrorFunc(nullptr, nullptr);
     prependToError(_strXmlError);
 }
 
@@ -59,7 +59,7 @@ void CXmlSerializingContext::structuredErrorHandler(void *userData, xmlErrorPtr
 {
     CXmlSerializingContext *self = static_cast<CXmlSerializingContext *>(userData);
 
-    std::string filename = (error->file != NULL) ? error->file : "(user input)";
+    std::string filename = (error->file != nullptr) ? error->file : "(user input)";
     // xmlErrorPtr->int2 contains the column; see xmlerror.h
     self->_strXmlError += filename + ":" + std::to_string(error->line) + ":" +
                           std::to_string(error->int2) + ": " + error->message;