projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ee05b1c
)
Fix build with newer boost.
author
Carl Hetherington
<cth@carlh.net>
Sat, 22 Sep 2018 16:03:29 +0000
(17:03 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 22 Sep 2018 16:03:29 +0000
(17:03 +0100)
src/subtitle_asset.cc
patch
|
blob
|
history
diff --git
a/src/subtitle_asset.cc
b/src/subtitle_asset.cc
index 880c3120badb403d33516e08a1156337b4281255..bb7b0b1ccf4f535d964ee72f2d23d221778b36f0 100644
(file)
--- a/
src/subtitle_asset.cc
+++ b/
src/subtitle_asset.cc
@@
-53,7
+53,6
@@
using std::list;
using std::cout;
using std::cerr;
using std::map;
-using std::distance;
using boost::shared_ptr;
using boost::shared_array;
using boost::optional;
@@
-539,7
+538,7
@@
SubtitleAsset::pull_fonts (shared_ptr<order::Part> part)
while (j != part->children.end() && (*i)->font == (*j)->font) {
++j;
}
- if (distance (i, j) == 1) {
+ if (
std::
distance (i, j) == 1) {
merged.push_back (*i);
++i;
} else {