Rename Platform::GetFile (3-arg version) to GetFileWithUUID
This rename was suggested by gclayton as a way to silence gcc warnings; the warning is emitted when there is an overloaded function in a base class (Platform) for which a derived class redefines one of the overloads but not the other (because doing so hides the other overload from users of the derived class). By giving the two methods different names, the situation is avoided. llvm-svn: 199504
This commit is contained in:
parent
21afbe034e
commit
fc99572540
|
@ -314,9 +314,9 @@ namespace lldb_private {
|
|||
/// An error object.
|
||||
//------------------------------------------------------------------
|
||||
virtual Error
|
||||
GetFile (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file);
|
||||
GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file);
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Locate the scripting resource given a module specification.
|
||||
|
|
|
@ -571,14 +571,14 @@ PlatformFreeBSD::GetGroupName (uint32_t gid)
|
|||
|
||||
// From PlatformMacOSX only
|
||||
Error
|
||||
PlatformFreeBSD::GetFile (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
PlatformFreeBSD::GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
{
|
||||
if (IsRemote())
|
||||
{
|
||||
if (m_remote_platform_sp)
|
||||
return m_remote_platform_sp->GetFile (platform_file, uuid_ptr, local_file);
|
||||
return m_remote_platform_sp->GetFileWithUUID (platform_file, uuid_ptr, local_file);
|
||||
}
|
||||
|
||||
// Default to the local case
|
||||
|
|
|
@ -144,8 +144,8 @@ public:
|
|||
|
||||
// Only on PlatformMacOSX:
|
||||
virtual lldb_private::Error
|
||||
GetFile (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file);
|
||||
GetFileWithUUID (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file);
|
||||
|
||||
lldb_private::Error
|
||||
GetSharedModule (const lldb_private::ModuleSpec &module_spec,
|
||||
|
|
|
@ -285,13 +285,13 @@ PlatformLinux::ResolveExecutable (const FileSpec &exe_file,
|
|||
}
|
||||
|
||||
Error
|
||||
PlatformLinux::GetFile (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr, FileSpec &local_file)
|
||||
PlatformLinux::GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr, FileSpec &local_file)
|
||||
{
|
||||
if (IsRemote())
|
||||
{
|
||||
if (m_remote_platform_sp)
|
||||
return m_remote_platform_sp->GetFile (platform_file, uuid_ptr, local_file);
|
||||
return m_remote_platform_sp->GetFileWithUUID (platform_file, uuid_ptr, local_file);
|
||||
}
|
||||
|
||||
// Default to the local case
|
||||
|
|
|
@ -73,8 +73,8 @@ namespace lldb_private {
|
|||
GetStatus (Stream &strm);
|
||||
|
||||
virtual Error
|
||||
GetFile (const FileSpec &platform_file,
|
||||
const UUID* uuid, FileSpec &local_file);
|
||||
GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID* uuid, FileSpec &local_file);
|
||||
|
||||
virtual bool
|
||||
GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &proc_info);
|
||||
|
|
|
@ -249,7 +249,7 @@ PlatformMacOSX::GetSymbolFile (const FileSpec &platform_file,
|
|||
if (IsRemote())
|
||||
{
|
||||
if (m_remote_platform_sp)
|
||||
return m_remote_platform_sp->GetFile (platform_file, uuid_ptr, local_file);
|
||||
return m_remote_platform_sp->GetFileWithUUID (platform_file, uuid_ptr, local_file);
|
||||
}
|
||||
|
||||
// Default to the local case
|
||||
|
@ -258,9 +258,9 @@ PlatformMacOSX::GetSymbolFile (const FileSpec &platform_file,
|
|||
}
|
||||
|
||||
lldb_private::Error
|
||||
PlatformMacOSX::GetFile (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID *uuid_ptr,
|
||||
lldb_private::FileSpec &local_file)
|
||||
PlatformMacOSX::GetFileWithUUID (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID *uuid_ptr,
|
||||
lldb_private::FileSpec &local_file)
|
||||
{
|
||||
if (IsRemote() && m_remote_platform_sp)
|
||||
{
|
||||
|
|
|
@ -87,9 +87,9 @@ public:
|
|||
}
|
||||
|
||||
virtual lldb_private::Error
|
||||
GetFile (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID *uuid_ptr,
|
||||
lldb_private::FileSpec &local_file);
|
||||
GetFileWithUUID (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID *uuid_ptr,
|
||||
lldb_private::FileSpec &local_file);
|
||||
|
||||
virtual bool
|
||||
GetSupportedArchitectureAtIndex (uint32_t idx,
|
||||
|
|
|
@ -542,14 +542,14 @@ PlatformWindows::GetGroupName (uint32_t gid)
|
|||
}
|
||||
|
||||
Error
|
||||
PlatformWindows::GetFile (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
PlatformWindows::GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
{
|
||||
if (IsRemote())
|
||||
{
|
||||
if (m_remote_platform_sp)
|
||||
return m_remote_platform_sp->GetFile (platform_file, uuid_ptr, local_file);
|
||||
return m_remote_platform_sp->GetFileWithUUID (platform_file, uuid_ptr, local_file);
|
||||
}
|
||||
|
||||
// Default to the local case
|
||||
|
|
|
@ -125,8 +125,8 @@ public:
|
|||
lldb_private::Error &error);
|
||||
|
||||
virtual lldb_private::Error
|
||||
GetFile(const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file);
|
||||
GetFileWithUUID(const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID* uuid, lldb_private::FileSpec &local_file);
|
||||
|
||||
lldb_private::Error
|
||||
GetSharedModule(const lldb_private::ModuleSpec &module_spec,
|
||||
|
|
|
@ -119,9 +119,9 @@ PlatformRemoteGDBServer::ResolveExecutable (const FileSpec &exe_file,
|
|||
}
|
||||
|
||||
Error
|
||||
PlatformRemoteGDBServer::GetFile (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
PlatformRemoteGDBServer::GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
{
|
||||
// Default to the local case
|
||||
local_file = platform_file;
|
||||
|
|
|
@ -73,9 +73,9 @@ public:
|
|||
GetDescription ();
|
||||
|
||||
virtual lldb_private::Error
|
||||
GetFile (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID *uuid_ptr,
|
||||
lldb_private::FileSpec &local_file);
|
||||
GetFileWithUUID (const lldb_private::FileSpec &platform_file,
|
||||
const lldb_private::UUID *uuid_ptr,
|
||||
lldb_private::FileSpec &local_file);
|
||||
|
||||
virtual bool
|
||||
GetProcessInfo (lldb::pid_t pid,
|
||||
|
|
|
@ -81,9 +81,9 @@ Platform::SetDefaultPlatform (const lldb::PlatformSP &platform_sp)
|
|||
}
|
||||
|
||||
Error
|
||||
Platform::GetFile (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
Platform::GetFileWithUUID (const FileSpec &platform_file,
|
||||
const UUID *uuid_ptr,
|
||||
FileSpec &local_file)
|
||||
{
|
||||
// Default to the local case
|
||||
local_file = platform_file;
|
||||
|
|
|
@ -1067,7 +1067,7 @@ Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files)
|
|||
FileSpec dependent_file_spec (dependent_files.GetFileSpecPointerAtIndex(i));
|
||||
FileSpec platform_dependent_file_spec;
|
||||
if (m_platform_sp)
|
||||
m_platform_sp->GetFile (dependent_file_spec, NULL, platform_dependent_file_spec);
|
||||
m_platform_sp->GetFileWithUUID (dependent_file_spec, NULL, platform_dependent_file_spec);
|
||||
else
|
||||
platform_dependent_file_spec = dependent_file_spec;
|
||||
|
||||
|
|
Loading…
Reference in New Issue