From 911844b16c6b627f421bc3368de427de3ca9f60c Mon Sep 17 00:00:00 2001 From: Patrick Benavoli Date: Wed, 23 Jul 2014 01:27:00 +0200 Subject: Type mismatch corrections (Windows 64 bits) This patch removes the type mismatch warnings revealed by Windows 64 compiler. Wherever necessary, used size_t type for size related data. Change-Id: Ie045ce95940cd83fe8d681168ac9526fc6028d43 Signed-off-by: Patrick Benavoli --- parameter/EnumParameterType.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'parameter/EnumParameterType.cpp') diff --git a/parameter/EnumParameterType.cpp b/parameter/EnumParameterType.cpp index 126a2a5..8cca7d7 100644 --- a/parameter/EnumParameterType.cpp +++ b/parameter/EnumParameterType.cpp @@ -63,8 +63,8 @@ void CEnumParameterType::showProperties(string& strResult) const strResult += "Value Pairs:\n"; // Show all value pairs - uint32_t uiChild; - uint32_t uiNbChildren = getNbChildren(); + size_t uiChild; + size_t uiNbChildren = getNbChildren(); for (uiChild = 0; uiChild < uiNbChildren; uiChild++) { @@ -281,8 +281,8 @@ bool CEnumParameterType::isNumber(const string& strValue) // Literal - numerical conversions bool CEnumParameterType::getLiteral(int32_t iNumerical, string& strLiteral) const { - uint32_t uiChild; - uint32_t uiNbChildren = getNbChildren(); + size_t uiChild; + size_t uiNbChildren = getNbChildren(); for (uiChild = 0; uiChild < uiNbChildren; uiChild++) { @@ -301,8 +301,8 @@ bool CEnumParameterType::getLiteral(int32_t iNumerical, string& strLiteral) cons bool CEnumParameterType::getNumerical(const string& strLiteral, int& iNumerical) const { - uint32_t uiChild; - uint32_t uiNbChildren = getNbChildren(); + size_t uiChild; + size_t uiNbChildren = getNbChildren(); for (uiChild = 0; uiChild < uiNbChildren; uiChild++) { @@ -323,8 +323,8 @@ bool CEnumParameterType::getNumerical(const string& strLiteral, int& iNumerical) bool CEnumParameterType::isValid(int iNumerical, CParameterAccessContext& parameterAccessContext) const { // Check that the value is part of the allowed values for this kind of enum - uint32_t uiChild; - uint32_t uiNbChildren = getNbChildren(); + size_t uiChild; + size_t uiNbChildren = getNbChildren(); for (uiChild = 0; uiChild < uiNbChildren; uiChild++) { -- cgit v1.1