diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-24 00:45:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-24 00:45:27 +0100 |
| commit | 9eb185cc5872c00956a645b2ce92a3431ed7db68 (patch) | |
| tree | 8602bf7286098c9cb16b3727706ba1ca0f42cb65 /src | |
| parent | 132476caf9cbebfdde5ecf0080e8ce2b591d8172 (diff) | |
| parent | 62c7d0c33b06ffadc09fb6c25d8dba673c384c47 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp
Diffstat (limited to 'src')
| -rw-r--r-- | src/subtitle_asset.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 880c3120..bb7b0b1c 100644 --- 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 { |