projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
test
/
film_metadata_test.cc
diff --git
a/test/film_metadata_test.cc
b/test/film_metadata_test.cc
index d61f5f0d186e86b2cd10dcaac951f95fc77097b4..970c6526d764ae3d609390e3ffca458e564a99a1 100644
(file)
--- a/
test/film_metadata_test.cc
+++ b/
test/film_metadata_test.cc
@@
-22,19
+22,17
@@
* @brief Test some basic reading/writing of film metadata.
*/
* @brief Test some basic reading/writing of film metadata.
*/
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/date_time.hpp>
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "test.h"
#include "lib/film.h"
#include "lib/dcp_content_type.h"
#include "lib/ratio.h"
#include "test.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/date_time.hpp>
-#include <boost/make_shared.hpp>
using std::string;
using std::list;
using boost::shared_ptr;
using std::string;
using std::list;
using boost::shared_ptr;
-using boost::make_shared;
BOOST_AUTO_TEST_CASE (film_metadata_test)
{
BOOST_AUTO_TEST_CASE (film_metadata_test)
{
@@
-55,7
+53,7
@@
BOOST_AUTO_TEST_CASE (film_metadata_test)
ignore.push_back ("Key");
check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
ignore.push_back ("Key");
check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
- shared_ptr<Film> g
= make_shared<Film> (dir
);
+ shared_ptr<Film> g
(new Film (dir)
);
g->read_metadata ();
BOOST_CHECK_EQUAL (g->name(), "fred");
g->read_metadata ();
BOOST_CHECK_EQUAL (g->name(), "fred");