Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.h
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdArgContext.h
+++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h
@@ -28,11 +28,11 @@
     /* ctor */ CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw);
     //
     const CMIUtilString &GetArgsLeftToParse(void) const;
-    MIuint GetNumberArgsPresent(void) const;
+    size_t GetNumberArgsPresent(void) const;
     CMIUtilString::VecString_t GetArgs(void) const;
     bool IsEmpty(void) const;
     bool RemoveArg(const CMIUtilString &vArg);
-    bool RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex);
+    bool RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex);
     //
     CMICmdArgContext &operator=(const CMICmdArgContext &vOther);
 
Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp
+++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp
@@ -149,9 +149,9 @@
 // Throws:  None.
 //--
 bool
-CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex)
+CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex)
 {
-    MIuint nWordIndex = 0;
+    size_t nWordIndex = 0;
     CMIUtilString strBuildContextUp;
     const CMIUtilString::VecString_t vecWords(GetArgs());
     const bool bSpaceRequired(GetNumberArgsPresent() > 2);
@@ -202,10 +202,10 @@
 // Details: Retrieve number of arguments or options present in the command's option text.
 // Type:    Method.
 // Args:    None.
-// Return:  MIuint  - 0 to n arguments present.
+// Return:  size_t  - 0 to n arguments present.
 // Throws:  None.
 //--
-MIuint
+size_t
 CMICmdArgContext::GetNumberArgsPresent(void) const
 {
     CMIUtilString::VecString_t vecOptions;
Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.h
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdArgSet.h
+++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h
@@ -67,7 +67,7 @@
     bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const;
     const SetCmdArgs_t &GetArgsThatAreMissing(void) const;
     const SetCmdArgs_t &GetArgsThatInvalid(void) const;
-    MIuint GetCount(void) const;
+    size_t GetCount(void) const;
     bool IsArgContextEmpty(void) const;
     bool IsArgsPresentButNotHandledByCmd(void) const;
     void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName);
Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp
===================================================================
--- lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp
+++ lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp
@@ -335,10 +335,10 @@
 // Details: Retrieve the number of arguments that are being used for the command.
 // Type:    Method.
 // Args:    None.
-// Return:  MIuint - Argument count.
+// Return:  size_t - Argument count.
 // Throws:  None.
 //--
-MIuint
+size_t
 CMICmdArgSet::GetCount(void) const
 {
     return m_setCmdArgs.size();