C++11 tidying.

diff --git a/src/lib/string_text_file.cc b/src/lib/string_text_file.cc
index b8ca27e160ca989ad283768f963a1bdf974546db..76abe547f35045413e1a7b945f72a939d59ea72a 100644 (file)
--- a/src/lib/string_text_file.cc
+++ b/src/lib/string_text_file.cc
@@ -118,7 +118,7 @@ optional<ContentTime>
 StringTextFile::first () const
 {
        if (_subtitles.empty()) {
-               return optional<ContentTime>();
+               return {};
        }
 
        return ContentTime::from_seconds(_subtitles[0].from.all_as_seconds());
@@ -128,7 +128,7 @@ ContentTime
 StringTextFile::length () const
 {
        if (_subtitles.empty ()) {
-               return ContentTime ();
+               return {};
        }
 
        return ContentTime::from_seconds (_subtitles.back().to.all_as_seconds ());

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index e9302c6a0a4a461b4b793f849f37c5b52b3908fc..65574cc67e349b121174264c1bf11154f2b35065 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -458,7 +458,7 @@ public:
 
                set_film (film);
 
-               JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
+               JobManager::instance()->add(make_shared<CheckContentChangeJob>(film));
        }
        catch (FileNotFoundError& e) {
                auto const dir = e.file().parent_path();