summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Wilson <wilsons@start.ca>2011-03-26 00:34:57 +0000
committerStephen Wilson <wilsons@start.ca>2011-03-26 00:34:57 +0000
commit78decfd0258eb6bd688d563df10fd2ab1fdb8daf (patch)
tree32a5ce23541f36f60c96e40274eeca332f063313
parent63f37bba1aec7b50617ea889b88da0e347f9b962 (diff)
downloadbcm5719-llvm-78decfd0258eb6bd688d563df10fd2ab1fdb8daf.tar.gz
bcm5719-llvm-78decfd0258eb6bd688d563df10fd2ab1fdb8daf.zip
linux: minor updates to account for recent namespace changes
llvm-svn: 128313
-rw-r--r--lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp5
-rw-r--r--lldb/source/Plugins/Platform/Linux/PlatformLinux.h5
-rw-r--r--lldb/source/Plugins/Process/Linux/RegisterContextLinux_i386.h4
-rw-r--r--lldb/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h4
4 files changed, 10 insertions, 8 deletions
diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
index f7b278ac281..c5200d20b60 100644
--- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
+++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
@@ -164,7 +164,8 @@ PlatformLinux::ResolveExecutable (const FileSpec &exe_file,
}
Error
-PlatformLinux::GetFile (const FileSpec &platform_file, FileSpec &local_file)
+PlatformLinux::GetFile (const FileSpec &platform_file,
+ const UUID *uuid, FileSpec &local_file)
{
// Default to the local case
local_file = platform_file;
@@ -192,7 +193,7 @@ PlatformLinux::~PlatformLinux()
uint32_t
PlatformLinux::FindProcessesByName (const char *name_match,
- lldb::NameMatchType name_match_type,
+ NameMatchType name_match_type,
ProcessInfoList &process_infos)
{
return Host::FindProcessesByName (name_match, name_match_type, process_infos);
diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.h b/lldb/source/Plugins/Platform/Linux/PlatformLinux.h
index 91fc3ecc14c..395778bb6f4 100644
--- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.h
+++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.h
@@ -81,11 +81,12 @@ namespace lldb_private {
GetStatus (Stream &strm);
virtual Error
- GetFile (const FileSpec &platform_file, FileSpec &local_file);
+ GetFile (const FileSpec &platform_file,
+ const UUID* uuid, FileSpec &local_file);
virtual uint32_t
FindProcessesByName (const char *name_match,
- lldb::NameMatchType name_match_type,
+ NameMatchType name_match_type,
ProcessInfoList &process_infos);
virtual bool
diff --git a/lldb/source/Plugins/Process/Linux/RegisterContextLinux_i386.h b/lldb/source/Plugins/Process/Linux/RegisterContextLinux_i386.h
index 30b3d7073c1..890fd88240e 100644
--- a/lldb/source/Plugins/Process/Linux/RegisterContextLinux_i386.h
+++ b/lldb/source/Plugins/Process/Linux/RegisterContextLinux_i386.h
@@ -33,13 +33,13 @@ public:
size_t
GetRegisterCount();
- const lldb::RegisterInfo *
+ const lldb_private::RegisterInfo *
GetRegisterInfoAtIndex(uint32_t reg);
size_t
GetRegisterSetCount();
- const lldb::RegisterSet *
+ const lldb_private::RegisterSet *
GetRegisterSet(uint32_t set);
bool
diff --git a/lldb/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h b/lldb/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h
index 08d2cbdaafb..48540b4e60a 100644
--- a/lldb/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h
+++ b/lldb/source/Plugins/Process/Linux/RegisterContextLinux_x86_64.h
@@ -32,13 +32,13 @@ public:
size_t
GetRegisterCount();
- const lldb::RegisterInfo *
+ const lldb_private::RegisterInfo *
GetRegisterInfoAtIndex(uint32_t reg);
size_t
GetRegisterSetCount();
- const lldb::RegisterSet *
+ const lldb_private::RegisterSet *
GetRegisterSet(uint32_t set);
bool
OpenPOWER on IntegriCloud