wok annotate e4rat/stuff/e4rat-boost.u @ rev 20883

updated enca and enca-dev (1.13 -> 1.19)
author Hans-G?nter Theisgen
date Mon Feb 25 14:49:07 2019 +0100 (2019-02-25)
parents
children
rev   line source
pascal@13591 1 --- CMakeLists.txt.orig 2012-09-07 03:17:55.515017487 +0200
pascal@13591 2 +++ CMakeLists.txt 2012-09-13 19:54:18.160054076 +0200
pascal@13591 3 @@ -15,7 +15,6 @@
pascal@13591 4 ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
pascal@13591 5
pascal@13591 6 set(Boost_USE_MULTITHREADED OFF)
pascal@13591 7 -add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
pascal@13591 8 find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
pascal@13591 9 set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES}
pascal@13591 10 ${Boost_LIBRARIES})
pascal@13591 11 --- src/config.cc.orig 2012-09-13 19:50:32.829871091 +0200
pascal@13591 12 +++ src/config.cc 2012-09-13 19:55:37.023068153 +0200
pascal@13591 13 @@ -71,7 +71,7 @@
pascal@13591 14 return;
pascal@13591 15 }
pascal@13591 16
pascal@13591 17 - tool_name = fs::path(argv[0]).filename();
pascal@13591 18 + tool_name = fs::path(argv[0]).filename().string();
pascal@13591 19 found = tool_name.find_last_of("-");
pascal@13591 20 if(found)
pascal@13591 21 defaultSection = tool_name.substr(found+1);
pascal@13591 22 --- src/common.cc.orig 2012-09-13 19:58:06.187203344 +0200
pascal@13591 23 +++ src/common.cc 2012-09-13 19:59:34.752096130 +0200
pascal@13591 24 @@ -157,7 +157,7 @@
pascal@13591 25 p /= filesearch;
pascal@13591 26 }
pascal@13591 27 // Initialize regex filter - use * as default if nothing is given in filesearch
pascal@13591 28 - std::string f( p.has_filename() ? p.filename() : "*");
pascal@13591 29 + std::string f( p.has_filename() ? p.filename().string() : "*");
pascal@13591 30
pascal@13591 31 fs::path dir(system_complete(p).parent_path());
pascal@13591 32 if( is_directory(dir) )
pascal@13591 33 @@ -166,8 +166,8 @@
pascal@13591 34 it!=boost::filesystem::directory_iterator();
pascal@13591 35 ++it )
pascal@13591 36 {
pascal@13591 37 - if( boost::regex_match( it->leaf(), path2regex(f) ) )
pascal@13591 38 - fileset.push_back(it->string());
pascal@13591 39 + if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
pascal@13591 40 + fileset.push_back(it->path().filename().string());
pascal@13591 41 }
pascal@13591 42 return fileset;
pascal@13591 43 }
pascal@13591 44 --- src/e4rat-collect.cc.orig 2012-09-13 20:03:40.185027797 +0200
pascal@13591 45 +++ src/e4rat-collect.cc 2012-09-13 20:03:54.404850024 +0200
pascal@13591 46 @@ -396,7 +396,7 @@
pascal@13591 47 * Parse application list given as arguments
pascal@13591 48 */
pascal@13591 49 for ( ; optind < argc; optind++)
pascal@13591 50 - project.observeApp(fs::path(argv[optind]).filename());
pascal@13591 51 + project.observeApp(fs::path(argv[optind]).filename().string());
pascal@13591 52
pascal@13591 53 /*
pascal@13591 54 * Parse application list on stdin
pascal@13591 55 --- src/device.cc.orig 2012-09-13 20:00:40.232277516 +0200
pascal@13591 56 +++ src/device.cc 2012-09-13 20:03:11.026392331 +0200
pascal@13591 57 @@ -196,13 +196,13 @@
pascal@13591 58 it != end_itr;
pascal@13591 59 ++it )
pascal@13591 60 {
pascal@13591 61 - if(it->filename() == "root")
pascal@13591 62 + if(it->path().filename().string() == "root")
pascal@13591 63 continue;
pascal@13591 64 - if(lstat(it->string().c_str(), &st))
pascal@13591 65 + if(lstat(it->path().filename().c_str(), &st))
pascal@13591 66 continue;
pascal@13591 67 if(st.st_rdev == get()->devno)
pascal@13591 68 {
pascal@13591 69 - get()->deviceName = it->filename();
pascal@13591 70 + get()->deviceName = it->path().filename().string();
pascal@13591 71 get()->devicePath = "/dev/" + get()->deviceName;
pascal@13591 72 return 0;
pascal@13591 73 }
pascal@13591 74 @@ -225,7 +225,7 @@
pascal@13591 75 // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
pascal@13591 76 // for convenience set deviceName and devicePath to a common name
pascal@13591 77 get()->deviceName = "virtual file system";
pascal@13591 78 - get()->devicePath = get()->mount_point.filename();
pascal@13591 79 + get()->devicePath = get()->mount_point.filename().string();
pascal@13591 80 return 0;
pascal@13591 81 case 2:
pascal@13591 82 ss << "fd";