diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
| commit | 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch) | |
| tree | 769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /src/lib/subtitle_content.cc | |
| parent | 4e83acad0c2a5c528709a175a80261b8147d3b49 (diff) | |
Use make_shared<>.
Diffstat (limited to 'src/lib/subtitle_content.cc')
| -rw-r--r-- | src/lib/subtitle_content.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 5b3b453b6..9fd49831f 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -28,6 +28,7 @@ #include <libcxml/cxml.h> #include <libxml++/libxml++.h> #include <boost/foreach.hpp> +#include <boost/make_shared.hpp> #include <iostream> #include "i18n.h" @@ -37,6 +38,7 @@ using std::vector; using std::cout; using std::list; using boost::shared_ptr; +using boost::make_shared; using boost::dynamic_pointer_cast; int const SubtitleContentProperty::X_OFFSET = 500; @@ -84,6 +86,7 @@ SubtitleContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version return shared_ptr<SubtitleContent> (); } + /* Can't use make_shared here as the constructor is private */ return shared_ptr<SubtitleContent> (new SubtitleContent (parent, node, version)); } @@ -130,7 +133,7 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int list<cxml::NodePtr> fonts = node->node_children ("Font"); for (list<cxml::NodePtr>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { - _fonts.push_back (shared_ptr<Font> (new Font (*i))); + _fonts.push_back (make_shared<Font> (*i)); } connect_to_fonts (); |
