Small bits of pre-release tidying.

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index 07e4f782f58393a2acacda0480d14d5442914512..232b91ccb44a80b13883fc0a29bd12754716a0f7 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -38,11 +38,12 @@
  *  @brief Utility methods.
  */
 
+
+#include "array_data.h"
 #include "types.h"
-#include "data.h"
 #include "local_time.h"
 #include <asdcp/KM_log.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/function.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
@@ -64,7 +65,7 @@ class OpenJPEGImage;
 
 extern std::string make_uuid ();
 extern std::string make_digest (boost::filesystem::path filename, boost::function<void (float)>);
-extern std::string make_digest (Data data);
+extern std::string make_digest (ArrayData data);
 extern bool empty_or_white_space (std::string s);
 extern bool ids_equal (std::string a, std::string b);
 extern std::string remove_urn_uuid (std::string raw);
@@ -81,7 +82,7 @@ extern std::string spaces (int n);
 extern void indent (xmlpp::Element* element, int initial);
 extern bool day_less_than_or_equal (LocalTime a, LocalTime b);
 extern bool day_greater_than_or_equal (LocalTime a, LocalTime b);
-extern std::string unique_string (std::list<std::string> existing, std::string base);
+extern std::string unique_string (std::vector<std::string> existing, std::string base);
 extern ASDCP::Dictionary const* asdcp_smpte_dict;