commit 911844b16c6b627f421bc3368de427de3ca9f60c
author Patrick Benavoli <patrick.benavoli@intel.com> Wed Jul 23 01:27:00 2014 +0200
committer Eric Laurent <elaurent@google.com> Fri Apr 24 13:39:13 2015 -0700
tree 223697b3ea168eca090cd06a673c7dbb7dea27de
parent 9ad87f08eb4cfa8752f4b9e7b9deb3bd219ff591

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>

xmlserializer/XmlElement.cpp

diff --git a/xmlserializer/XmlElement.cpp b/xmlserializer/XmlElement.cpp
index d45f360..8f86c77 100644
--- a/xmlserializer/XmlElement.cpp
+++ b/xmlserializer/XmlElement.cpp
@@ -175,10 +175,10 @@
     return false;
 }
 
-uint32_t CXmlElement::getNbChildElements() const
+size_t CXmlElement::getNbChildElements() const
 {
     CXmlElement childElement;
-    uint32_t uiNbChildren = 0;
+    size_t uiNbChildren = 0;
 
     CChildIterator childIterator(*this);
 

xmlserializer/XmlElement.h

diff --git a/xmlserializer/XmlElement.h b/xmlserializer/XmlElement.h
index 7c1d518..4673be4 100644
--- a/xmlserializer/XmlElement.h
+++ b/xmlserializer/XmlElement.h
@@ -61,7 +61,7 @@
     // Navigation
     bool getChildElement(const std::string& strType, CXmlElement& childElement) const;
     bool getChildElement(const std::string& strType, const std::string& strNameAttribute, CXmlElement& childElement) const;
-    uint32_t getNbChildElements() const;
+    size_t getNbChildElements() const;
     bool getParentElement(CXmlElement& parentElement) const;
 
     // Setters

xmlserializer/XmlStringDocSource.cpp

diff --git a/xmlserializer/XmlStringDocSource.cpp b/xmlserializer/XmlStringDocSource.cpp
index ec2d7e9..8d420b6 100644
--- a/xmlserializer/XmlStringDocSource.cpp
+++ b/xmlserializer/XmlStringDocSource.cpp
@@ -39,7 +39,7 @@
                                          const std::string& strRootElementName,
                                          const std::string& strNameAttrituteName,
                                          bool bValidateWithSchema) :
-    base(xmlReadMemory(strXmlInput.c_str(), strXmlInput.size(), "", NULL, 0),
+    base(xmlReadMemory(strXmlInput.c_str(), (int)strXmlInput.size(), "", NULL, 0),
          strXmlSchemaFile,
          strRootElementType,
          strRootElementName,