X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fref.cc;h=8527150d7e552013ae18ee33c9b89d4777f027df;hb=69431e4ef7bb46f0c38279192a67457a9c13dfd8;hp=ca2d74938cb1a21d33674e5ac6a79e9a06a2cbbc;hpb=05c5ef180e7a54e0b6790b2bd8c334e48f1f069a;p=libdcp.git

diff --git a/src/ref.cc b/src/ref.cc
index ca2d7493..8527150d 100644
--- a/src/ref.cc
+++ b/src/ref.cc
@@ -1,35 +1,49 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    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 "ref.h"
 
-using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::vector;
 using namespace dcp;
 
 /** Look through a list of assets and copy a shared_ptr to any asset
  *  which matches the ID of this one.
  */
 void
-Ref::resolve (list<shared_ptr<Asset> > assets)
+Ref::resolve (vector<shared_ptr<Asset>> assets)
 {
-	list<shared_ptr<Asset> >::iterator i = assets.begin();
+	auto i = assets.begin();
 	while (i != assets.end() && !ids_equal ((*i)->id(), _id)) {
 		++i;
 	}