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 /indra/llvfs | |
| parent | 8e99b826457ab0161c12e11e7b5465ce6a3d10f3 (diff) | |
Fixes from Oz's merge.
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir_mac.cpp | 4 | 
1 files changed, 3 insertions, 1 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 | 
