Sort out a number of mismatched integer types in order to cut down the number of compiler warnings.

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@184333 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 6 insertions, 6 deletions

diff --git a/include/lldb/DataFormatters/FormatNavigator.h b/include/lldb/DataFormatters/FormatNavigator.h
index c5acdc378..0d3a83366 100644
--- a/include/lldb/DataFormatters/FormatNavigator.h
+++ b/include/lldb/DataFormatters/FormatNavigator.h
@@ -71,7 +71,7 @@ HasPrefix (const char* str1, const char* str2)
 // those will not match any type because of the way we strip qualifiers from typenames
 // this method looks for the case where the user is adding a "class","struct","enum" or "union" Foo
 // and strips the unnecessary qualifier
-static ConstString
+static inline ConstString
 GetValidTypeName_Impl (const ConstString& type)
 {
     int strip_len = 0;
diff --git a/include/lldb/DataFormatters/TypeSynthetic.h b/include/lldb/DataFormatters/TypeSynthetic.h
index 21939c30a..a32f4b761 100644
--- a/include/lldb/DataFormatters/TypeSynthetic.h
+++ b/include/lldb/DataFormatters/TypeSynthetic.h
@@ -295,20 +295,20 @@ namespace lldb_private {
             m_expression_paths.clear();
         }
         
-        int
+        size_t
         GetCount() const
         {
             return m_expression_paths.size();
         }
         
         const char*
-        GetExpressionPathAtIndex(int i) const
+        GetExpressionPathAtIndex(size_t i) const
         {
             return m_expression_paths[i].c_str();
         }
         
         bool
-        SetExpressionPathAtIndex (int i, const char* path)
+        SetExpressionPathAtIndex (size_t i, const char* path)
         {
             return SetExpressionPathAtIndex(i, std::string(path));
         }
@@ -329,7 +329,7 @@ namespace lldb_private {
         }
         
         bool
-        SetExpressionPathAtIndex (int i, const std::string& path)
+        SetExpressionPathAtIndex (size_t i, const std::string& path)
         {
             if (i >= GetCount())
                 return false;
@@ -399,7 +399,7 @@ namespace lldb_private {
             GetIndexOfChildWithName (const ConstString &name)
             {
                 const char* name_cstr = name.GetCString();
-                for (int i = 0; i < filter->GetCount(); i++)
+                for (size_t i = 0; i < filter->GetCount(); i++)
                 {
                     const char* expr_cstr = filter->GetExpressionPathAtIndex(i);
                     if (expr_cstr)