projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_combiner.cc
diff --git
a/src/tools/dcpomatic_combiner.cc
b/src/tools/dcpomatic_combiner.cc
index 19103fc335b17fbc3bf083be4ab22a9e887184d4..886c1c613b28fe51e683a05afc9d8968aa99d9ec 100644
(file)
--- a/
src/tools/dcpomatic_combiner.cc
+++ b/
src/tools/dcpomatic_combiner.cc
@@
-40,9
+40,9
@@
DCPOMATIC_ENABLE_WARNINGS
using std::exception;
using std::string;
using std::vector;
using std::exception;
using std::string;
using std::vector;
-using
boost
::dynamic_pointer_cast;
+using
std
::dynamic_pointer_cast;
using boost::optional;
using boost::optional;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif