wok view e4rat/stuff/e4rat-boost.u @ rev 20645

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