X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fatmos_content.cc;h=cc74209e0ee8abc4f2a51fd30afca91cda0b2313;hp=2e59b92b7f288d1653189efd9399a2d7803730b1;hb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;hpb=1f342aad4040b6aa05e8eee13e53153f899c3d9e diff --git a/src/lib/atmos_content.cc b/src/lib/atmos_content.cc index 2e59b92b7..cc74209e0 100644 --- a/src/lib/atmos_content.cc +++ b/src/lib/atmos_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2020 Carl Hetherington + Copyright (C) 2020-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -20,12 +20,16 @@ #include "atmos_content.h" +#include "warnings.h" #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS +using std::make_shared; using std::string; -using boost::shared_ptr; +using std::shared_ptr; int const AtmosContentProperty::EDIT_RATE = 700; @@ -51,10 +55,10 @@ shared_ptr AtmosContent::from_xml (Content* parent, cxml::ConstNodePtr node) { if (!node->optional_node_child("AtmosLength")) { - return shared_ptr(); + return {}; } - return shared_ptr (new AtmosContent(parent, node)); + return make_shared(parent, node); }