diff options
| author | S. Davilla <davilla@4pi.com> | 2013-10-27 19:22:31 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2013-10-27 19:32:31 -0400 |
| commit | 154733c92fe730be15e3917af2ada47f6f046c5d (patch) | |
| tree | 7df89695b37a8905d45e1f5a9a17284759a73b4b | |
| parent | 07b69106ed4eaf819eac1fd85709a2826f88e53f (diff) | |
darwin, fixed, compiler warning. DarwinUtils.h is C linkage so you should not be using C++ objects as return or params
| -rw-r--r-- | xbmc/osx/DarwinUtils.h | 2 | ||||
| -rw-r--r-- | xbmc/osx/DarwinUtils.mm | 4 | ||||
| -rw-r--r-- | xbmc/settings/AdvancedSettings.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/osx/DarwinUtils.h b/xbmc/osx/DarwinUtils.h index e0d3f976a2..a20016b112 100644 --- a/xbmc/osx/DarwinUtils.h +++ b/xbmc/osx/DarwinUtils.h @@ -38,7 +38,7 @@ extern "C" float GetIOSVersion(void); int GetDarwinFrameworkPath(bool forPython, char* path, uint32_t *pathsize); int GetDarwinExecutablePath(char* path, uint32_t *pathsize); - const std::string& DarwinGetXbmcRootFolder(void); + const char *DarwinGetXbmcRootFolder(void); bool DarwinIsIosSandboxed(void); bool DarwinHasVideoToolboxDecoder(void); int DarwinBatteryLevel(void); diff --git a/xbmc/osx/DarwinUtils.mm b/xbmc/osx/DarwinUtils.mm index cf555825e3..f9b390d22f 100644 --- a/xbmc/osx/DarwinUtils.mm +++ b/xbmc/osx/DarwinUtils.mm @@ -277,7 +277,7 @@ int GetDarwinExecutablePath(char* path, uint32_t *pathsize) return 0; } -const std::string& DarwinGetXbmcRootFolder(void) +const char* DarwinGetXbmcRootFolder(void) { static std::string rootFolder = ""; if ( rootFolder.length() == 0) @@ -294,7 +294,7 @@ const std::string& DarwinGetXbmcRootFolder(void) rootFolder = "Library/Preferences"; } } - return rootFolder; + return rootFolder.c_str(); } bool DarwinIsIosSandboxed(void) diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp index 665be8f9f0..0f30d84442 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -420,7 +420,7 @@ void CAdvancedSettings::Initialize() #if defined(TARGET_DARWIN_OSX) logDir += "/Library/Logs/"; #else // ios/atv2 - logDir += "/" + DarwinGetXbmcRootFolder() + "/"; + logDir += "/" + CStdString(DarwinGetXbmcRootFolder()) + "/"; #endif m_logFolder = logDir; #else |