From 34d3a38a9caf50b4893155cbcb161d1137554c3d Mon Sep 17 00:00:00 2001
From: Johnny Chen <johnny.chen@apple.com>
Date: Fri, 20 Apr 2012 23:59:21 +0000
Subject: [PATCH] Method name change to avoid further conflicts when merging
 from ToT to branches/lldb-platform-work.

llvm-svn: 155260
---
 lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp | 8 ++++----
 lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
index 67aa6e401608..a1fcaf2b953c 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
@@ -580,9 +580,9 @@ PlatformRemoteiOS::GetFileInSDKRoot (const char *platform_file_path,
 
 
 Error
-PlatformRemoteiOS::GetFile (const FileSpec &platform_file, 
-                            const UUID *uuid_ptr,
-                            FileSpec &local_file)
+PlatformRemoteiOS::GetSymbolFile (const FileSpec &platform_file, 
+                                  const UUID *uuid_ptr,
+                                  FileSpec &local_file)
 {
     Error error;
     char platform_file_path[PATH_MAX];
@@ -653,7 +653,7 @@ PlatformRemoteiOS::GetSharedModule (const ModuleSpec &module_spec,
 
     FileSpec local_file;
     const UUID *module_uuid_ptr = module_spec.GetUUIDPtr();
-    Error error (GetFile (platform_file, module_uuid_ptr, local_file));
+    Error error (GetSymbolFile (platform_file, module_uuid_ptr, local_file));
     if (error.Success())
     {
         error = ResolveExecutable (local_file, module_spec.GetArchitecture(), module_sp, NULL);
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
index b3f123505cf8..d52c6b09df72 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
@@ -91,9 +91,9 @@ public:
     GetStatus (lldb_private::Stream &strm);
 
     virtual lldb_private::Error
-    GetFile (const lldb_private::FileSpec &platform_file, 
-             const lldb_private::UUID *uuid_ptr,
-             lldb_private::FileSpec &local_file);
+    GetSymbolFile (const lldb_private::FileSpec &platform_file, 
+                   const lldb_private::UUID *uuid_ptr,
+                   lldb_private::FileSpec &local_file);
 
     virtual lldb_private::Error
     GetSharedModule (const lldb_private::ModuleSpec &module_spec,