7 files changed, 8 insertions, 8 deletions
diff --git a/lldb/include/lldb/Interpreter/OptionGroupBoolean.h b/lldb/include/lldb/Interpreter/OptionGroupBoolean.h
index 45f24640a2a..0d861b24169 100644
--- a/lldb/include/lldb/Interpreter/OptionGroupBoolean.h
+++ b/lldb/include/lldb/Interpreter/OptionGroupBoolean.h
@@ -31,7 +31,7 @@ namespace lldb_private {
         OptionGroupBoolean (uint32_t usage_mask,
                             bool required,
                             const char *long_option, 
-                            char short_option,
+                            int short_option,
                             const char *usage_text,
                             bool default_value,
                             bool no_argument_toggle_default);
diff --git a/lldb/include/lldb/Interpreter/OptionGroupFile.h b/lldb/include/lldb/Interpreter/OptionGroupFile.h
index 9730b5b7434..632a2dbdf22 100644
--- a/lldb/include/lldb/Interpreter/OptionGroupFile.h
+++ b/lldb/include/lldb/Interpreter/OptionGroupFile.h
@@ -31,7 +31,7 @@ public:
     OptionGroupFile (uint32_t usage_mask,
                      bool required,
                      const char *long_option, 
-                     char short_option,
+                     int short_option,
                      uint32_t completion_type,
                      lldb::CommandArgumentType argument_type,
                      const char *usage_text);
@@ -89,7 +89,7 @@ public:
     OptionGroupFileList (uint32_t usage_mask,
                          bool required,
                          const char *long_option, 
-                         char short_option,
+                         int short_option,
                          uint32_t completion_type,
                          lldb::CommandArgumentType argument_type,
                          const char *usage_text);
diff --git a/lldb/include/lldb/Interpreter/OptionGroupString.h b/lldb/include/lldb/Interpreter/OptionGroupString.h
index 9389f0d1864..e62a81bc411 100644
--- a/lldb/include/lldb/Interpreter/OptionGroupString.h
+++ b/lldb/include/lldb/Interpreter/OptionGroupString.h
@@ -29,7 +29,7 @@ namespace lldb_private {
         OptionGroupString (uint32_t usage_mask,
                            bool required,
                            const char *long_option, 
-                           char short_option,
+                           int short_option,
                            uint32_t completion_type,
                            lldb::CommandArgumentType argument_type,
                            const char *usage_text,
diff --git a/lldb/include/lldb/Interpreter/OptionGroupUInt64.h b/lldb/include/lldb/Interpreter/OptionGroupUInt64.h
index 428d927739a..c5f9e85d2f8 100644
--- a/lldb/include/lldb/Interpreter/OptionGroupUInt64.h
+++ b/lldb/include/lldb/Interpreter/OptionGroupUInt64.h
@@ -29,7 +29,7 @@ namespace lldb_private {
         OptionGroupUInt64 (uint32_t usage_mask,
                            bool required,
                            const char *long_option, 
-                           char short_option,
+                           int short_option,
                            uint32_t completion_type,
                            lldb::CommandArgumentType argument_type,
                            const char *usage_text,
diff --git a/lldb/include/lldb/Interpreter/Options.h b/lldb/include/lldb/Interpreter/Options.h
index 861c62245c2..e1314450a0d 100644
--- a/lldb/include/lldb/Interpreter/Options.h
+++ b/lldb/include/lldb/Interpreter/Options.h
@@ -296,7 +296,7 @@ public:
     
 protected:
     // This is a set of options expressed as indexes into the options table for this Option.
-    typedef std::set<char> OptionSet;
+    typedef std::set<int> OptionSet;
     typedef std::vector<OptionSet> OptionSetVector;
 
     CommandInterpreter &m_interpreter;
diff --git a/lldb/include/lldb/Symbol/VariableList.h b/lldb/include/lldb/Symbol/VariableList.h
index 21f37e4fc9f..e2b5722f1f6 100644
--- a/lldb/include/lldb/Symbol/VariableList.h
+++ b/lldb/include/lldb/Symbol/VariableList.h
@@ -42,7 +42,7 @@ public:
     Dump(Stream *s, bool show_context) const;
 
     lldb::VariableSP
-    GetVariableAtIndex(uint32_t idx);
+    GetVariableAtIndex(uint32_t idx) const;
 
     lldb::VariableSP
     RemoveVariableAtIndex (uint32_t idx);
diff --git a/lldb/include/lldb/lldb-private-types.h b/lldb/include/lldb/lldb-private-types.h
index 710e37cfd6b..4340af114be 100644
--- a/lldb/include/lldb/lldb-private-types.h
+++ b/lldb/include/lldb/lldb-private-types.h
@@ -58,7 +58,7 @@ namespace lldb_private
                                                  // then this option belongs to option set n.
         bool required;                           // This option is required (in the current usage level)
         const char *long_option;                 // Full name for this option.
-        char short_option;                       // Single character for this option.
+        int short_option;                        // Single character for this option.
         int option_has_arg;                      // no_argument, required_argument or optional_argument
         OptionEnumValueElement *enum_values;     // If non-NULL an array of enum values.
         uint32_t completion_type;                // Cookie the option class can use to do define the argument completion.