Fixed the LLDB build so that we can have private types, private enums and

public types and public enums. This was done to keep the SWIG stuff from
parsing all sorts of enums and types that weren't needed, and allows us to
abstract our API better.

llvm-svn: 128239

4 files changed, 7 insertions, 7 deletions

diff --git a/lldb/source/Interpreter/Args.cpp b/lldb/source/Interpreter/Args.cpp
index d278873b813..df276baff6f 100644
--- a/lldb/source/Interpreter/Args.cpp
+++ b/lldb/source/Interpreter/Args.cpp
@@ -796,7 +796,7 @@ Args::StringToVersion (const char *s, uint32_t &major, uint32_t &minor, uint32_t
 
 
 int32_t
-Args::StringToOptionEnum (const char *s, lldb::OptionEnumValueElement *enum_values, int32_t fail_value, bool *success_ptr)
+Args::StringToOptionEnum (const char *s, OptionEnumValueElement *enum_values, int32_t fail_value, bool *success_ptr)
 {    
     if (enum_values && s && s[0])
     {
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 0fd9dabe750..98786f7c5cc 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -76,7 +76,7 @@ CommandInterpreter::CommandInterpreter
     StreamString var_name;
     var_name.Printf ("[%s].script-lang", dbg_name);
     debugger.GetSettingsController()->SetVariable (var_name.GetData(), lang_name.c_str(), 
-                                                   lldb::eVarSetOperationAssign, false, 
+                                                   eVarSetOperationAssign, false, 
                                                    m_debugger.GetInstanceName().AsCString());                                                   
     SetEventName (eBroadcastBitThreadShouldExit, "thread-should-exit");
     SetEventName (eBroadcastBitResetPrompt, "reset-prompt");
diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index 38d5cfbedac..dff61198643 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -489,7 +489,7 @@ CommandObject::GetArgumentName (CommandArgumentType arg_type)
 }
 
 bool
-CommandObject::IsPairType (lldb::ArgumentRepetitionType arg_repeat_type)
+CommandObject::IsPairType (ArgumentRepetitionType arg_repeat_type)
 {
     if ((arg_repeat_type == eArgRepeatPairPlain)
         ||  (arg_repeat_type == eArgRepeatPairOptional)
diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp
index cd810c6e0bc..630f24cbf3f 100644
--- a/lldb/source/Interpreter/Options.cpp
+++ b/lldb/source/Interpreter/Options.cpp
@@ -177,7 +177,7 @@ Options::BuildValidOptionSets ()
     if (num_options == 0)
         return;
 
-    const lldb::OptionDefinition *full_options_table = GetDefinitions();
+    const OptionDefinition *full_options_table = GetDefinitions();
     m_required_options.resize(1);
     m_optional_options.resize(1);
     
@@ -230,7 +230,7 @@ Options::BuildValidOptionSets ()
 uint32_t
 Options::NumCommandOptions ()
 {
-    const lldb::OptionDefinition *full_options_table = GetDefinitions ();
+    const OptionDefinition *full_options_table = GetDefinitions ();
     if (full_options_table == NULL) 
         return 0;
         
@@ -258,7 +258,7 @@ Options::GetLongOptions ()
 
         uint32_t i;
         uint32_t j;
-        const lldb::OptionDefinition *full_options_table = GetDefinitions();
+        const OptionDefinition *full_options_table = GetDefinitions();
 
         std::bitset<256> option_seen;
 
@@ -368,7 +368,7 @@ Options::GenerateOptionUsage
 {
     const uint32_t screen_width = interpreter.GetDebugger().GetTerminalWidth();
 
-    const lldb::OptionDefinition *full_options_table = GetDefinitions();
+    const OptionDefinition *full_options_table = GetDefinitions();
     const uint32_t save_indent_level = strm.GetIndentLevel();
     const char *name;