projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted c++11 cleanups.
[libdcp.git]
/
test
/
combine_test.cc
diff --git
a/test/combine_test.cc
b/test/combine_test.cc
index fc34109ba2f2284fa7b01c283152b40436cceba3..09a4577021ea314f09dbf909960b762e040688ea 100644
(file)
--- a/
test/combine_test.cc
+++ b/
test/combine_test.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020
-2021
Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
This file is part of libdcp.
@@
-44,7
+44,6
@@
#include "verify.h"
#include "reel_markers_asset.h"
#include <boost/algorithm/string.hpp>
#include "verify.h"
#include "reel_markers_asset.h"
#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <boost/test/unit_test.hpp>
#include <iostream>
#include <boost/optional.hpp>
#include <boost/test/unit_test.hpp>
#include <iostream>
@@
-74,7
+73,7
@@
static
void
dump_notes (vector<dcp::VerificationNote> const & notes)
{
void
dump_notes (vector<dcp::VerificationNote> const & notes)
{
-
BOOST_FOREACH (dcp::VerificationNote i,
notes) {
+
for (auto i:
notes) {
std::cout << dcp::note_to_string(i) << "\n";
}
}
std::cout << dcp::note_to_string(i) << "\n";
}
}
@@
-100,7
+99,7
@@
template <class T>
shared_ptr<T>
pointer_to_id_in_vector (shared_ptr<T> needle, vector<shared_ptr<T> > haystack)
{
shared_ptr<T>
pointer_to_id_in_vector (shared_ptr<T> needle, vector<shared_ptr<T> > haystack)
{
-
BOOST_FOREACH (shared_ptr<T> i,
haystack) {
+
for (auto i:
haystack) {
if (i->id() == needle->id()) {
return i;
}
if (i->id() == needle->id()) {
return i;
}