From: Carl Hetherington Date: Thu, 22 Apr 2021 17:53:57 +0000 (+0200) Subject: C++11 tweaks. X-Git-Tag: v2.15.141~37 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2383b09a62ca5e9100b45bf4a2b766b4b8efba51 C++11 tweaks. --- diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index 9a3b55e0a..7e13b50ae 100644 --- 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 #include + 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(new Screen(i))); + add_screen (make_shared(i)); } } diff --git a/src/lib/cinema.h b/src/lib/cinema.h index daa4aa8bf..a89408f3f 100644 --- a/src/lib/cinema.h +++ b/src/lib/cinema.h @@ -81,7 +81,7 @@ public: } private: - std::list > _screens; + std::list> _screens; /** Offset such that the equivalent time in UTC can be determined by subtracting the offset from the local time. */