From 09e16aa3acf7878b54a4995a0be79890f26db09f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 3 May 2014 20:18:07 +0100
Subject: Assorted test fixes.

---
 src/dcp.cc | 4 ++--
 src/dcp.h  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/dcp.cc b/src/dcp.cc
index dc0ffeaa..044e1f53 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -69,7 +69,7 @@ DCP::DCP (boost::filesystem::path directory)
 }
 
 template<class T> void
-survivable_error (bool keep_going, list<shared_ptr<DCPReadError> >* errors, T const & e)
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
 {
 	if (keep_going) {
 		if (errors) {
@@ -81,7 +81,7 @@ survivable_error (bool keep_going, list<shared_ptr<DCPReadError> >* errors, T co
 }
 
 void
-DCP::read (bool keep_going, list<shared_ptr<DCPReadError> >* errors)
+DCP::read (bool keep_going, ReadErrors* errors)
 {
 	/* Read the ASSETMAP */
 	
diff --git a/src/dcp.h b/src/dcp.h
index 66486ca0..1fa7ae0c 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -69,11 +69,13 @@ public:
 	 */
 	DCP (boost::filesystem::path directory);
 
+	typedef std::list<boost::shared_ptr<DCPReadError> > ReadErrors;
+	
 	/** Read the DCP's structure into this object.
 	 *  @param keep_going true to try to keep going in the face of (some) errors.
 	 *  @param errors List of errors that will be added to if keep_going is true.
 	 */
-	void read (bool keep_going = false, std::list<boost::shared_ptr<DCPReadError> >* errors = 0);
+	void read (bool keep_going = false, ReadErrors* errors = 0);
 
 	/** Compare this DCP with another, according to various options.
 	 *  @param other DCP to compare this one to.
-- 
cgit v1.2.3