obscurestar avatar obscurestar committed 12655fb

Fixes from Oz's merge.

Comments (0)

Files changed (2)

indra/llvfs/lldir_mac.cpp

         
         boost::filesystem::path executablepath(*executablepathstr);
         
-        mExecutableFilename = executablepath.filename();
+# ifndef BOOST_SYSTEM_NO_DEPRECATED
+#endif
+        mExecutableFilename = executablepath.filename().string();
         mExecutableDir = executablepath.parent_path().string();
 		
 		// mAppRODataDir

indra/mac_updater/mac_updater.cpp

     {
         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))
         //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;
     
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.