summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2013-10-30 18:40:41 +0000
committerGreg Clayton <gclayton@apple.com>2013-10-30 18:40:41 +0000
commitc1ae724757cb5ce577db044f432a383991c898ec (patch)
treee60c28e7cdb1073c508c7c0a87d11061981cede6
parent00e24e48b64525064c88c2b380df7085ba808cdf (diff)
downloadbcm5719-llvm-c1ae724757cb5ce577db044f432a383991c898ec.tar.gz
bcm5719-llvm-c1ae724757cb5ce577db044f432a383991c898ec.zip
Fixed a warning in PlatformiOSSimulator where GetSDKDirectory was hiding recently added virtual function. Renamed GetSDKDirectory to GetSDKsDirectory to fix the issue. GetSDKsDirectory is a better fit because it finds the directory that contains all SDKs, not the current one.
llvm-svn: 193707
-rw-r--r--lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp6
-rw-r--r--lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
index f12843965a1..ac0a96cfbdb 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
@@ -162,7 +162,7 @@ void
PlatformiOSSimulator::GetStatus (Stream &strm)
{
Platform::GetStatus (strm);
- const char *sdk_directory = GetSDKDirectory();
+ const char *sdk_directory = GetSDKsDirectory();
if (sdk_directory)
strm.Printf (" SDK Path: \"%s\"\n", sdk_directory);
else
@@ -268,7 +268,7 @@ EnumerateDirectoryCallback (void *baton, FileSpec::FileType file_type, const Fil
const char *
-PlatformiOSSimulator::GetSDKDirectory()
+PlatformiOSSimulator::GetSDKsDirectory()
{
if (m_sdk_directory.empty())
{
@@ -325,7 +325,7 @@ PlatformiOSSimulator::GetSymbolFile (const FileSpec &platform_file,
{
char resolved_path[PATH_MAX];
- const char * sdk_dir = GetSDKDirectory();
+ const char * sdk_dir = GetSDKsDirectory();
if (sdk_dir)
{
::snprintf (resolved_path,
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
index e75cf894904..81394a44e02 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h
@@ -105,7 +105,7 @@ protected:
//std::vector<FileSpec> m_device_support_os_dirs;
const char *
- GetSDKDirectory();
+ GetSDKsDirectory();
private:
DISALLOW_COPY_AND_ASSIGN (PlatformiOSSimulator);
OpenPOWER on IntegriCloud