Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-25 04:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for compilation with Boost v1.34.1.

Browse Source
This commit is contained in:
Moritz Bunkus 2009-12-28 20:44:00 +01:00
parent c94996a5f9
commit 430f3801dc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ac/ax_boost_filesystem_dependencies.m4
View File

@ -19,7 +19,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM_DEPENDENCIES],[
#include <boost/filesystem.hpp>
],[
boost::filesystem::path p1("/etc/hosts");
int i = p1.stem().length();
int i = boost::filesystem::basename(p1).length();
])],
[ax_cv_boost_dependencies_system=no],
[ax_cv_boost_dependencies_system=yes])

8
src/common/mm_multi_file_io.cpp
View File

@ -170,8 +170,8 @@ struct path_sorter_t {
mm_multi_file_io_cptr
mm_multi_file_io_c::open_multi(bfs::path first_file_name) {
std::string base_name = first_file_name.stem();
std::string extension = downcase(first_file_name.extension());
std::string base_name = bfs::basename(first_file_name);
std::string extension = downcase(bfs::extension(first_file_name));
boost::regex file_name_re("(.+?)(\\d+)", boost::regex::perl);
boost::smatch matches;
@ -191,10 +191,10 @@ mm_multi_file_io_c::open_multi(bfs::path first_file_name) {
bfs::directory_iterator end_itr;
for (bfs::directory_iterator itr(first_file_name.branch_path()); itr != end_itr; ++itr) {
if ( bfs::is_directory(itr->status())
|| (downcase(itr->path().extension()) != extension))
|| (downcase(bfs::extension(itr->path())) != extension))
continue;
std::string stem = itr->path().stem();
std::string stem = bfs::basename(itr->path());
int current_number = 0;
if ( !boost::regex_match(stem, matches, file_name_re)