[Lldb-commits] [lldb] r155260 - in /lldb/trunk/source/Plugins/Platform/MacOSX: PlatformRemoteiOS.cpp PlatformRemoteiOS.h

[Johnny Chen]

Author: johnny
Date: Fri Apr 20 18:59:21 2012
New Revision: 155260

URL: http://llvm.org/viewvc/llvm-project?rev=155260&view=rev
Log:
Method name change to avoid further conflicts when merging from ToT to branches/lldb-platform-work.

Modified:
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
    lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp?rev=155260&r1=155259&r2=155260&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp Fri Apr 20 18:59:21 2012
@@ -580,9 +580,9 @@
 
 
 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 @@
 
     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);

Modified: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h?rev=155260&r1=155259&r2=155260&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h (original)
+++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.h Fri Apr 20 18:59:21 2012
@@ -91,9 +91,9 @@
     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,