summaryrefslogtreecommitdiffstats
path: root/parameter/XmlFileIncluderElement.cpp
diff options
context:
space:
mode:
authorPatrick Benavoli <patrick.benavoli@intel.com>2014-07-23 01:27:00 +0200
committerEric Laurent <elaurent@google.com>2015-04-24 13:39:13 -0700
commit911844b16c6b627f421bc3368de427de3ca9f60c (patch)
tree223697b3ea168eca090cd06a673c7dbb7dea27de /parameter/XmlFileIncluderElement.cpp
parent9ad87f08eb4cfa8752f4b9e7b9deb3bd219ff591 (diff)
downloadexternal_parameter-framework-911844b16c6b627f421bc3368de427de3ca9f60c.zip
external_parameter-framework-911844b16c6b627f421bc3368de427de3ca9f60c.tar.gz
external_parameter-framework-911844b16c6b627f421bc3368de427de3ca9f60c.tar.bz2
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 <patrick.benavoli@intel.com>
Diffstat (limited to 'parameter/XmlFileIncluderElement.cpp')
-rw-r--r--parameter/XmlFileIncluderElement.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/parameter/XmlFileIncluderElement.cpp b/parameter/XmlFileIncluderElement.cpp
index 693b6fd..674a331 100644
--- a/parameter/XmlFileIncluderElement.cpp
+++ b/parameter/XmlFileIncluderElement.cpp
@@ -119,9 +119,9 @@ std::string CXmlFileIncluderElement::getIncludedElementType() const
{
std::string strKind = getKind();
- int iPosToRemoveFrom = strKind.rfind("Include", -1);
+ std::string::size_type pos = strKind.rfind("Include", std::string::npos);
- assert(iPosToRemoveFrom != -1);
+ assert(pos != std::string::npos);
- return strKind.substr(0, iPosToRemoveFrom);
+ return strKind.substr(0, pos);
}