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_kdm.cc
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 1d72af4d556d2625b2067efd81d552e87f6a3f7a..874573ce282582d0cc82fcf118f901d12d9f942e 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-71,11
+71,11
@@
using std::string;
using std::vector;
using std::pair;
using std::map;
using std::vector;
using std::pair;
using std::map;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::bind;
using boost::optional;
using boost::ref;
using boost::bind;
using boost::optional;
using boost::ref;
-using
boost
::dynamic_pointer_cast;
+using
std
::dynamic_pointer_cast;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
@@
-308,7
+308,7
@@
private:
list<KDMWithMetadataPtr> kdms;
string title;
list<KDMWithMetadataPtr> kdms;
string title;
- shared_ptr<DKDM> dkdm =
boost
::dynamic_pointer_cast<DKDM> (dkdm_base);
+ shared_ptr<DKDM> dkdm =
std
::dynamic_pointer_cast<DKDM> (dkdm_base);
if (dkdm) {
/* Decrypt the DKDM */
if (dkdm) {
/* Decrypt the DKDM */
@@
-596,7
+596,7
@@
private:
ScreensPanel* _screens;
KDMTimingPanel* _timing;
wxTreeCtrl* _dkdm;
ScreensPanel* _screens;
KDMTimingPanel* _timing;
wxTreeCtrl* _dkdm;
- typedef std::map<wxTreeItemId,
boost
::shared_ptr<DKDMBase> > DKDMMap;
+ typedef std::map<wxTreeItemId,
std
::shared_ptr<DKDMBase> > DKDMMap;
DKDMMap _dkdm_id;
wxButton* _add_dkdm;
wxButton* _add_dkdm_folder;
DKDMMap _dkdm_id;
wxButton* _add_dkdm;
wxButton* _add_dkdm_folder;