Another macOS std::list boost::thread SNAFU.

[dcpomatic.git] / src / lib / cinema.cc

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 3f1750621cea6166b1144b23fc754ce4972fbaf3..1902f15f9f4f091433f3fc10e12c8f4b5a301381 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -25,13 +25,13 @@
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::list;
 using std::string;
 using boost::shared_ptr;
-using boost::make_shared;
+using dcp::raw_convert;
+using dcpomatic::Screen;
 
 Cinema::Cinema (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))
@@ -58,7 +58,7 @@ Cinema::read_screens (cxml::ConstNodePtr node)
 {
        list<cxml::NodePtr> s = node->node_children ("Screen");
        for (list<cxml::NodePtr>::iterator i = s.begin(); i != s.end(); ++i) {
-               add_screen (make_shared<Screen> (*i));
+               add_screen (shared_ptr<Screen> (new Screen (*i)));
        }
 }
 
@@ -73,8 +73,8 @@ Cinema::as_xml (xmlpp::Element* parent) const
 
        parent->add_child("Notes")->add_child_text (notes);
 
-       parent->add_child("UTCOffsetHour")->add_child_text (dcp::raw_convert<string> (_utc_offset_hour));
-       parent->add_child("UTCOffsetMinute")->add_child_text (dcp::raw_convert<string> (_utc_offset_minute));
+       parent->add_child("UTCOffsetHour")->add_child_text (raw_convert<string> (_utc_offset_hour));
+       parent->add_child("UTCOffsetMinute")->add_child_text (raw_convert<string> (_utc_offset_minute));
 
        BOOST_FOREACH (shared_ptr<Screen> i, _screens) {
                i->as_xml (parent->add_child ("Screen"));