X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fatmos_content.cc;h=ada304dad1c698d5d167230b1f7b42ccbb6dc0ee;hb=e7efb7d651d4555ed8dd2b3c4980b5222d1e0521;hp=0543437a30ca06e7a44ea6a3fbf0249fec2d96ab;hpb=2bec3708fc744c18128c5bdb4c2a332f5c8eb283;p=dcpomatic.git

diff --git a/src/lib/atmos_content.cc b/src/lib/atmos_content.cc
index 0543437a3..ada304dad 100644
--- a/src/lib/atmos_content.cc
+++ b/src/lib/atmos_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,15 +20,16 @@
 
 
 #include "atmos_content.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
+using std::make_shared;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 int const AtmosContentProperty::EDIT_RATE = 700;
@@ -54,10 +55,10 @@ shared_ptr<AtmosContent>
 AtmosContent::from_xml (Content* parent, cxml::ConstNodePtr node)
 {
 	if (!node->optional_node_child("AtmosLength")) {
-		return shared_ptr<AtmosContent>();
+		return {};
 	}
 
-	return shared_ptr<AtmosContent> (new AtmosContent(parent, node));
+	return make_shared<AtmosContent>(parent, node);
 }