Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compilation with Boost's filesystem library v3; also require Boost 1.36.0 or newer

Browse Source
This commit is contained in:
Moritz Bunkus 2011-02-15 16:55:39 +01:00
parent 70235732c1
commit 597e307cc1
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2011-02-15 Moritz Bunkus <moritz@bunkus.org>
* build: Boost 1.36.0 or newer is required (up from 1.34.0). Also
fixed building with v3 of Boost's filesystem library, e.g. with
Boost 1.46.0 Beta 1 or newer.
* mkvpropedit: new feature: Added support for adding, replacing
and removing tags.

2
ac/boost.m4
View File

@ -1,5 +1,5 @@
# boost's headers must be present.
AX_BOOST_BASE([1.34.0])
AX_BOOST_BASE([1.36.0])
# boost::system can be absend for older versions. However, the test
# for boost::filesystem might fail if boost::system is not available

14
src/common/mm_multi_file_io.cpp
View File

@ -15,6 +15,7 @@
#include <algorithm>
#include <boost/regex.hpp>
#include <sstream>
#include <vector>
#include "common/mm_multi_file_io.h"
@ -155,14 +156,17 @@ mm_multi_file_io_c::create_verbose_identification_info(std::vector<std::string>
void
mm_multi_file_io_c::display_other_file_info() {
std::vector<std::string> file_names;
std::stringstream out;
foreach(const mm_multi_file_io_c::file_t &file, m_files)
if (file.m_file_name != m_files.front().m_file_name)
file_names.push_back(file.m_file_name.leaf());
if (file.m_file_name != m_files.front().m_file_name) {
if (!out.str().empty())
out << ", ";
out << file.m_file_name.filename();
}
if (!file_names.empty())
mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % join(", ", file_names));
if (!out.str().empty())
mxinfo(boost::format(Y("'%1%': Processing the following files as well: %2%\n")) % m_display_file_name % out.str());
}
struct path_sorter_t {