sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use make_shared to create shared_ptr.

Browse source
This commit is contained in:
Jordan Hollinger 2014-02-10 11:48:33 -05:00
parent e0125afdae
commit 489168d529
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/text/formatting/layout.cpp
View file

@ -60,8 +60,7 @@ void layout_node::to_xml(ptree &xml) const
node_ptr layout_node::from_xml(xml_node const& xml) node_ptr layout_node::from_xml(xml_node const& xml)
{ {
layout_node *n = new layout_node(); std::shared_ptr<layout_node> n = std::make_shared<layout_node>();
node_ptr np(n);
node_ptr child = node::from_xml(xml); node_ptr child = node::from_xml(xml);
n->set_child(child); n->set_child(child);
@ -77,7 +76,7 @@ node_ptr layout_node::from_xml(xml_node const& xml)
n->rotate_displacement = xml.get_opt_attr<boolean>("rotate-displacement"); n->rotate_displacement = xml.get_opt_attr<boolean>("rotate-displacement");
n->orientation = xml.get_opt_attr<expression_ptr>("orientation"); n->orientation = xml.get_opt_attr<expression_ptr>("orientation");
return np; return n;
} }
void layout_node::apply(char_properties_ptr p, feature_impl const& feature, text_layout &output) const void layout_node::apply(char_properties_ptr p, feature_impl const& feature, text_layout &output) const