mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2025-02-17 17:24:54 +00:00
Fix wrong usage of boost::remove_if by using boost::remove_erase_if
This commit is contained in:
parent
de51d7e9ca
commit
bbe1abb754
@ -15,6 +15,7 @@
|
|||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <boost/range/algorithm.hpp>
|
#include <boost/range/algorithm.hpp>
|
||||||
|
#include <boost/range/algorithm_ext/erase.hpp>
|
||||||
|
|
||||||
#include "common/hacks.h"
|
#include "common/hacks.h"
|
||||||
#include "common/random.h"
|
#include "common/random.h"
|
||||||
@ -66,7 +67,7 @@ void
|
|||||||
remove_unique_uint32(uint32_t number,
|
remove_unique_uint32(uint32_t number,
|
||||||
unique_id_category_e category) {
|
unique_id_category_e category) {
|
||||||
assert_valid_category(category);
|
assert_valid_category(category);
|
||||||
boost::remove_if(s_random_unique_numbers[category], [=](uint32_t stored_number) { return number == stored_number; });
|
boost::remove_erase_if(s_random_unique_numbers[category], [=](uint32_t stored_number) { return number == stored_number; });
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t
|
uint32_t
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <boost/range/algorithm.hpp>
|
#include <boost/range/algorithm.hpp>
|
||||||
|
#include <boost/range/algorithm_ext/erase.hpp>
|
||||||
|
|
||||||
#include <matroska/KaxChapters.h>
|
#include <matroska/KaxChapters.h>
|
||||||
#include <matroska/KaxTag.h>
|
#include <matroska/KaxTag.h>
|
||||||
@ -128,7 +129,7 @@ options_c::has_changes()
|
|||||||
|
|
||||||
void
|
void
|
||||||
options_c::remove_empty_targets() {
|
options_c::remove_empty_targets() {
|
||||||
boost::remove_if(m_targets, [](target_cptr &target) { return !target->has_changes(); });
|
boost::remove_erase_if(m_targets, [](target_cptr &target) { return !target->has_changes(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T> static ebml_element_cptr
|
template<typename T> static ebml_element_cptr
|
||||||
|
Loading…
Reference in New Issue
Block a user