In-line run of subs_in_out so that it gets the environment more easily.

[libdcp.git] / test / smpte_load_font_test.cc

diff --git a/test/smpte_load_font_test.cc b/test/smpte_load_font_test.cc
index fa9e3bd59f03737954382a4c0387ef2fba256187..adcbb0aa8431e8df955ae47367ac94cb1eb7f920 100644 (file)
--- a/test/smpte_load_font_test.cc
+++ b/test/smpte_load_font_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,22 +15,44 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+
 #include "smpte_load_font_node.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/test/unit_test.hpp>
 
+
+using std::make_shared;
+
+
 /** Test dcp::SMPTELoadFontNode */
 BOOST_AUTO_TEST_CASE (smpte_load_font_test1)
 {
        xmlpp::Document doc;
-       xmlpp::Element* text = doc.create_root_node("Font");
+       auto text = doc.create_root_node("Font");
 
        text->set_attribute ("ID", "my-great-id");
        text->add_child_text ("urn:uuid:my-great-urn");
-       dcp::SMPTELoadFontNode lf (cxml::ConstNodePtr (new cxml::Node (text)));
+       dcp::SMPTELoadFontNode lf (make_shared<cxml::Node>(text));
 
        BOOST_CHECK_EQUAL (lf.id, "my-great-id");
        BOOST_CHECK_EQUAL (lf.urn, "my-great-urn");