std::shared_ptr

[dcpomatic.git] / src / wx / content_widget.h

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 6505d08da75cc1344b5cede040035fdfa9f9df9b..d38609cb4b8c1d0e408a00406bf34e705548eead 100644 (file)
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -60,7 +60,7 @@ public:
                wxWindow* parent,
                T* wrapped,
                int property,
-               boost::function<boost::shared_ptr<S> (Content*)> part,
+               boost::function<std::shared_ptr<S> (Content*)> part,
                boost::function<U (S*)> model_getter,
                boost::function<void (S*, U)> model_setter,
                boost::function<void ()> view_changed,
@@ -90,7 +90,7 @@ public:
                return _wrapped;
        }
 
-       typedef std::vector<boost::shared_ptr<Content> > List;
+       typedef std::vector<std::shared_ptr<Content> > List;
 
        /** Set the content that this control is working on (i.e. the selected content) */
        void set_content (List content)
@@ -214,7 +214,7 @@ private:
        wxButton* _button;
        List _content;
        int _property;
-       boost::function<boost::shared_ptr<S> (Content *)> _part;
+       boost::function<std::shared_ptr<S> (Content *)> _part;
        boost::function<U (S*)> _model_getter;
        boost::function<void (S*, U)> _model_setter;
        boost::function<void ()> _view_changed;
@@ -238,7 +238,7 @@ public:
                wxWindow* parent,
                wxSpinCtrl* wrapped,
                int property,
-               boost::function<boost::shared_ptr<S> (Content *)> part,
+               boost::function<std::shared_ptr<S> (Content *)> part,
                boost::function<int (S*)> getter,
                boost::function<void (S*, int)> setter,
                boost::function<void ()> view_changed = boost::function<void ()>()
@@ -266,7 +266,7 @@ public:
                wxWindow* parent,
                wxSpinCtrlDouble* wrapped,
                int property,
-               boost::function<boost::shared_ptr<S> (Content *)> part,
+               boost::function<std::shared_ptr<S> (Content *)> part,
                boost::function<double (S*)> getter,
                boost::function<void (S*, double)> setter,
                boost::function<void ()> view_changed = boost::function<void ()>()
@@ -294,7 +294,7 @@ public:
                wxWindow* parent,
                wxChoice* wrapped,
                int property,
-               boost::function<boost::shared_ptr<S> (Content *)> part,
+               boost::function<std::shared_ptr<S> (Content *)> part,
                boost::function<U (S*)> getter,
                boost::function<void (S*, U)> setter,
                boost::function<U (int)> view_to_model,