2 files changed, 13 insertions, 15 deletions
diff --git a/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.cpp b/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.cpp
index de8b5f8ff67..4be89faaca5 100644
--- a/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.cpp
+++ b/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.cpp
@@ -15,8 +15,8 @@
 using namespace lldb;
 using namespace lldb_private;
 
-lldb_private::ArchDefaultUnwindPlan *
-ArchDefaultUnwindPlan_x86_64::CreateInstance (const lldb_private::ArchSpec &arch)
+ArchDefaultUnwindPlan *
+ArchDefaultUnwindPlan_x86_64::CreateInstance (const ArchSpec &arch)
 {
     if (arch.GetMachine () == llvm::Triple::x86_64)
         return new ArchDefaultUnwindPlan_x86_64 ();
@@ -24,7 +24,7 @@ ArchDefaultUnwindPlan_x86_64::CreateInstance (const lldb_private::ArchSpec &arch
 }
 
 ArchDefaultUnwindPlan_x86_64::ArchDefaultUnwindPlan_x86_64() :
-                lldb_private::ArchDefaultUnwindPlan(), 
+                ArchDefaultUnwindPlan(), 
                 m_unwind_plan_sp (new UnwindPlan)
 { 
     UnwindPlan::Row row;
@@ -96,15 +96,16 @@ ArchDefaultUnwindPlan_x86_64::GetPluginDescriptionStatic()
 }
 
 UnwindPlanSP
-ArchDefaultUnwindPlan_x86_64::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc)
+ArchDefaultUnwindPlan_x86_64::GetArchDefaultUnwindPlan (Thread& thread, 
+                                                        const Address &current_pc)
 {
     return m_unwind_plan_sp;
 }
 
 
 
-lldb_private::ArchDefaultUnwindPlan *
-ArchDefaultUnwindPlan_i386::CreateInstance (const lldb_private::ArchSpec &arch)
+ArchDefaultUnwindPlan *
+ArchDefaultUnwindPlan_i386::CreateInstance (const ArchSpec &arch)
 {
     if (arch.GetMachine () == llvm::Triple::x86)
         return new ArchDefaultUnwindPlan_i386 ();
@@ -112,7 +113,7 @@ ArchDefaultUnwindPlan_i386::CreateInstance (const lldb_private::ArchSpec &arch)
 }
 
 ArchDefaultUnwindPlan_i386::ArchDefaultUnwindPlan_i386() :
-                lldb_private::ArchDefaultUnwindPlan(), 
+                ArchDefaultUnwindPlan(), 
                 m_unwind_plan_sp (new UnwindPlan)
 { 
     UnwindPlan::Row row;
@@ -185,7 +186,7 @@ ArchDefaultUnwindPlan_i386::GetPluginDescriptionStatic()
 }
 
 UnwindPlanSP
-ArchDefaultUnwindPlan_i386::GetArchDefaultUnwindPlan (Thread& thread, Address current_pc)
+ArchDefaultUnwindPlan_i386::GetArchDefaultUnwindPlan (Thread& thread, const Address &current_pc)
 {
     return m_unwind_plan_sp;
 }
diff --git a/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h b/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
index 53b37dfc829..ce5abb1c0d8 100644
--- a/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
+++ b/lldb/source/Plugins/ArchDefaultUnwindPlan/x86/ArchDefaultUnwindPlan-x86.h
@@ -15,8 +15,6 @@
 #include "lldb/Target/Thread.h"
 #include "lldb/Symbol/UnwindPlan.h"
 
-namespace lldb_private {
-    
 class ArchDefaultUnwindPlan_x86_64 : public lldb_private::ArchDefaultUnwindPlan
 {
 public:
@@ -24,7 +22,8 @@ public:
     ~ArchDefaultUnwindPlan_x86_64 () { }
 
     virtual lldb::UnwindPlanSP
-    GetArchDefaultUnwindPlan (Thread& thread, Address current_pc);
+    GetArchDefaultUnwindPlan (lldb_private::Thread& thread, 
+                              const lldb_private::Address &current_pc);
 
     static lldb_private::ArchDefaultUnwindPlan *
     CreateInstance (const lldb_private::ArchSpec &arch);
@@ -66,7 +65,8 @@ public:
     ~ArchDefaultUnwindPlan_i386 () { }
 
     virtual lldb::UnwindPlanSP
-    GetArchDefaultUnwindPlan (Thread& thread, Address current_pc);
+    GetArchDefaultUnwindPlan (lldb_private::Thread& thread, 
+                              const lldb_private::Address& current_pc);
 
     static lldb_private::ArchDefaultUnwindPlan *
     CreateInstance (const lldb_private::ArchSpec &arch);
@@ -101,7 +101,4 @@ private:
     lldb::UnwindPlanSP m_unwind_plan_sp;
 };
 
-
-} // namespace lldb_private
-
 #endif // liblldb_UnwindAssembly_x86_h_