diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-22 19:53:57 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-22 19:53:57 +0200 |
| commit | 2383b09a62ca5e9100b45bf4a2b766b4b8efba51 (patch) | |
| tree | f92b167a2b180a60d3b9d7a0aa677e756a4cec8e /src | |
| parent | 19562f913b530adc5f11c48e257300c1869d019a (diff) | |
C++11 tweaks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/cinema.cc | 6 | ||||
| -rw-r--r-- | src/lib/cinema.h | 2 |
2 files changed, 6 insertions, 2 deletions
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 <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 daa4aa8bf..a89408f3f 100644 --- 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. */ |