C++11 tweaks.

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 9a3b55e0aafe2dfc4ae8443ab33f2e1038938fd0..7e13b50aea775ef4900b637e145913aa742c92a8 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "cinema.h"
 #include "screen.h"
 #include "dcpomatic_assert.h"
@@ -26,12 +27,15 @@
 #include <libxml++/libxml++.h>
 #include <iostream>
 
+
 using std::list;
 using std::string;
 using std::shared_ptr;
+using std::make_shared;
 using dcp::raw_convert;
 using dcpomatic::Screen;
 
+
 Cinema::Cinema (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))
        , notes (node->optional_string_child("Notes").get_value_or(""))
@@ -56,7 +60,7 @@ void
 Cinema::read_screens (cxml::ConstNodePtr node)
 {
        for (auto i: node->node_children("Screen")) {
-               add_screen (shared_ptr<Screen>(new Screen(i)));
+               add_screen (make_shared<Screen>(i));
        }
 }
 

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index daa4aa8bf3f6a520fda7064206ff6a71e8d15908..a89408f3f28f94610f9f6470beacb5f83856e87c 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -81,7 +81,7 @@ public:
        }
 
 private:
-       std::list<std::shared_ptr<dcpomatic::Screen> > _screens;
+       std::list<std::shared_ptr<dcpomatic::Screen>> _screens;
        /** Offset such that the equivalent time in UTC can be determined
            by subtracting the offset from the local time.
        */