diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-03 22:31:18 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-03 22:31:18 +0200 |
| commit | e72a1a09cd65d7ea07b5993cce052b5160073531 (patch) | |
| tree | 328c79d7e3b8ebb77b60f8b93f6c5f0f582872d5 /src/ssa_reader.cc | |
| parent | 7959af606932dad96432f54b79ea16a32442addb (diff) | |
| parent | 587e475e3a20d35daf73a45208fd8227411313d7 (diff) | |
Merge.v1.6.0
Diffstat (limited to 'src/ssa_reader.cc')
| -rw-r--r-- | src/ssa_reader.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ssa_reader.cc b/src/ssa_reader.cc index 4a9be0e..39b99d2 100644 --- a/src/ssa_reader.cc +++ b/src/ssa_reader.cc @@ -24,7 +24,7 @@ #include "subtitle.h" #include "compose.hpp" #include <boost/algorithm/string.hpp> -#include <boost/bind.hpp> +#include <boost/bind/bind.hpp> #include <iostream> #include <vector> @@ -35,6 +35,9 @@ using std::cout; using boost::optional; using boost::function; using namespace boost::algorithm; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace sub; /** @param s Subtitle string encoded in UTF-8 */ |