diff options
author | Sebastien Guiriec <sebastien.guiriec@renault.com> | 2016-04-26 07:26:09 +0200 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2019-03-12 17:48:47 -0700 |
commit | 67f663e08dfcebdfaea69df36ebae6167595a549 (patch) | |
tree | 66e6f26a6a09209dafcfb350ce0531e0fca154be /upstream/parameter/ConfigurableElement.cpp | |
parent | 9a458296b14bbbf4d3d4760b809c8613d46fdafb (diff) | |
download | parameter-framework-67f663e08dfcebdfaea69df36ebae6167595a549.tar.gz |
[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>
Diffstat (limited to 'upstream/parameter/ConfigurableElement.cpp')
-rw-r--r-- | upstream/parameter/ConfigurableElement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/upstream/parameter/ConfigurableElement.cpp b/upstream/parameter/ConfigurableElement.cpp index 615d72b..1aecf11 100644 --- a/upstream/parameter/ConfigurableElement.cpp +++ b/upstream/parameter/ConfigurableElement.cpp @@ -378,7 +378,7 @@ ISyncer *CConfigurableElement::getSyncer() const return static_cast<const CConfigurableElement *>(pParent)->getSyncer(); } - return NULL; + return nullptr; } // Syncer set (me, ascendant or descendant ones) @@ -630,7 +630,7 @@ const CSubsystem *CConfigurableElement::getBelongingSubsystem() const // Stop at system class if (!pParent->getParent()) { - return NULL; + return nullptr; } return static_cast<const CConfigurableElement *>(pParent)->getBelongingSubsystem(); |