summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-21 23:08:53 +0100
commita8a0dfd1b21de6c0facf965ab119833ff6f790bf (patch)
tree88bd3a7dd6d4ae56a1efa9b7443c341550759869 /src/lib/subtitle_content.cc
parente669b562937786bf5b771c927cc03a4074b01be8 (diff)
Revert "Use make_shared<>."
Support for this seems to vary wildly across DoM's build targets. Stuff that builds on 16.04 won't build on 14.04, for example. Seems to not be worth the hassle now. This reverts commit 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f.
Diffstat (limited to 'src/lib/subtitle_content.cc')
-rw-r--r--src/lib/subtitle_content.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 9fd49831f..5b3b453b6 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -28,7 +28,6 @@
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
@@ -38,7 +37,6 @@ 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;
@@ -86,7 +84,6 @@ 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));
}
@@ -133,7 +130,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 (make_shared<Font> (*i));
+ _fonts.push_back (shared_ptr<Font> (new Font (*i)));
}
connect_to_fonts ();