Bump libdcp.

[libsub.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index dea8023f787b6770cd553aca39bc129383931829..28da387f2ba8327c5da4ee6be4171baf9cf70617 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,14 +17,24 @@
 
 */
 
+/** @file  src/util.h
+ *  @brief Utility methods.
+ */
+
 #include <boost/optional.hpp>
+#include <memory>
 #include <string>
 
+#define LIBSUB_UNUSED(x) (void)(x)
+
 namespace sub {
 
+class Reader;
+
 extern bool empty_or_white_space (std::string s);
 extern void remove_unicode_bom (boost::optional<std::string>& line);
-extern boost::optional<std::string> get_line_stringstream (std::stringstream* str);
 extern boost::optional<std::string> get_line_file (FILE* f);
+extern boost::optional<std::string> get_line_string (std::string* s);
+extern void dump (std::shared_ptr<const Reader> read, std::ostream& os);
 
 }