aboutsummaryrefslogtreecommitdiffstats
path: root/parameter/ConfigurableElementAggregator.cpp
diff options
context:
space:
mode:
authorSebastien Gonzalve <oznog@zarb.org>2014-02-20 22:28:03 +0100
committerDavid Wagner <david.wagner@intel.com>2014-09-11 14:25:02 +0200
commitd9526499d6ab53b7d13d1434f748f6f2161c2e0a (patch)
tree8d2e2db275800821d4bf8873fc16b686bca60b2d /parameter/ConfigurableElementAggregator.cpp
parentffbf43b383bb8693741430b02c24dbc9b127f7f7 (diff)
downloadexternal_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.zip
external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.tar.gz
external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.tar.bz2
Remove using std::XXX from headers
This is a bad practice to have using in headers because it pollutes the namespace of any user of that header.
Diffstat (limited to 'parameter/ConfigurableElementAggregator.cpp')
-rw-r--r--parameter/ConfigurableElementAggregator.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/parameter/ConfigurableElementAggregator.cpp b/parameter/ConfigurableElementAggregator.cpp
index 917fec8..228db26 100644
--- a/parameter/ConfigurableElementAggregator.cpp
+++ b/parameter/ConfigurableElementAggregator.cpp
@@ -30,7 +30,7 @@
#include "ConfigurableElementAggregator.h"
#include "ConfigurableElement.h"
-CConfigurableElementAggregator::CConfigurableElementAggregator(list<const CConfigurableElement*>& aggregateList, MatchesAggregationCriterion pfnMatchesAggregationCriterion)
+CConfigurableElementAggregator::CConfigurableElementAggregator(std::list<const CConfigurableElement*>& aggregateList, MatchesAggregationCriterion pfnMatchesAggregationCriterion)
: _aggregateList(aggregateList), _pfnMatchesAggregationCriterion(pfnMatchesAggregationCriterion)
{
}
@@ -42,7 +42,7 @@ void CConfigurableElementAggregator::aggegate(const CConfigurableElement* pConfi
}
// Recursive aggregate
-bool CConfigurableElementAggregator::doAggregate(const CConfigurableElement* pConfigurableElement, list<const CConfigurableElement*>& aggregateList)
+bool CConfigurableElementAggregator::doAggregate(const CConfigurableElement* pConfigurableElement, std::list<const CConfigurableElement*>& aggregateList)
{
if (!(pConfigurableElement->*_pfnMatchesAggregationCriterion)()) {
@@ -50,7 +50,7 @@ bool CConfigurableElementAggregator::doAggregate(const CConfigurableElement* pCo
return false;
}
// Check children
- list<const CConfigurableElement*> childAggregateElementList;
+ std::list<const CConfigurableElement*> childAggregateElementList;
uint32_t uiIndex;
uint32_t uiNbChildren = pConfigurableElement->getNbChildren();