diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-12-13 18:27:32 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-12-13 18:27:32 -0800 |
| commit | 3a72577f397a3cd3ebcb2d3e80000716bf0befec (patch) | |
| tree | f8df645a9534a2104907577d83ec4ba271f005ff | |
| parent | 8e99b826457ab0161c12e11e7b5465ce6a3d10f3 (diff) | |
Fixes from Oz's merge.
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 4 | ||||
| -rw-r--r-- | indra/mac_updater/mac_updater.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 75b3d56ebc..c5041d434c 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -77,7 +77,9 @@ LLDir_Mac::LLDir_Mac() boost::filesystem::path executablepath(*executablepathstr); - mExecutableFilename = executablepath.filename(); +# ifndef BOOST_SYSTEM_NO_DEPRECATED +#endif + mExecutableFilename = executablepath.filename().string(); mExecutableDir = executablepath.parent_path().string(); // mAppRODataDir diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp index 34d2b07438..fc9565d63d 100644 --- a/indra/mac_updater/mac_updater.cpp +++ b/indra/mac_updater/mac_updater.cpp @@ -197,7 +197,7 @@ bool LLMacUpdater::findAppBundleOnDiskImage(const boost::filesystem::path& dir_p { if ( boost::filesystem::is_directory(itr->status()) ) { - std::string dir_name = itr->string(); + std::string dir_name = itr->path().string(); if ( isApplication(dir_name) ) { if(isFSRefViewerBundle(dir_name)) @@ -399,7 +399,7 @@ bool LLMacUpdater::moveApplication (const boost::filesystem::path& app_dir, //Grab filename from installdir append to tempdir move set aside_dir to moved path. std::string install_str = app_dir.parent_path().string(); std::string temp_str = temp_dir.string(); - std::string app_str = app_dir.filename(); + std::string app_str = app_dir.filename().string(); aside_dir = boost::filesystem::path( boost::filesystem::operator/(temp_dir,app_str) ); std::cout << "Attempting to move " << app_dir.string() << " to " << aside_dir.string() << std::endl; |