Missing iostream includes for Arch.

8 files changed, 27 insertions, 21 deletions

diff --git a/src/iso6937.cc b/src/iso6937.cc
index 47ce458..2b75116 100644
--- a/src/iso6937.cc
+++ b/src/iso6937.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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,11 +17,12 @@
 
 */
 
-#include <string>
-#include <boost/optional.hpp>
-#include <boost/locale.hpp>
 #include "iso6937_tables.h"
 #include "iso6937.h"
+#include <boost/optional.hpp>
+#include <boost/locale.hpp>
+#include <string>
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -38,7 +39,7 @@ sub::iso6937_to_utf16 (string s)
 	if (iso6937::diacriticals.empty ()) {
 		make_iso6937_tables ();
 	}
-	
+
 	wstring o;
 
 	boost::optional<unsigned char> diacritical;
@@ -79,7 +80,7 @@ sub::utf16_to_iso6937 (wstring s)
 	if (iso6937::diacriticals.empty ()) {
 		make_iso6937_tables ();
 	}
-	
+
 	/* XXX: slow */
 
 	string o;
@@ -101,4 +102,3 @@ sub::utf16_to_iso6937 (wstring s)
 
 	return o;
 }
-
diff --git a/src/stl_binary_reader.cc b/src/stl_binary_reader.cc
index 59cb92b..d477684 100644
--- a/src/stl_binary_reader.cc
+++ b/src/stl_binary_reader.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -25,6 +25,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/locale.hpp>
+#include <iostream>
 
 using std::map;
 using std::vector;
@@ -77,7 +78,7 @@ STLBinaryReader::STLBinaryReader (istream& in)
 	editor_contact_details = get_string (341, 32);
 
 	for (int i = 0; i < tti_blocks; ++i) {
-		
+
 		in.read ((char *) _buffer, 128);
 		if (in.gcount() != 128) {
 			throw STLError ("Could not read TTI block from binary STL file");
@@ -141,7 +142,7 @@ STLBinaryReader::STLBinaryReader (istream& in)
 				sub.text = utf_to_utf<char> (iso6937_to_utf16 (text.c_str()));
 				_subs.push_back (sub);
 			}
-				
+
 			/* XXX: justification */
 		}
 	}
diff --git a/src/stl_text_reader.cc b/src/stl_text_reader.cc
index ad155c9..c4c1090 100644
--- a/src/stl_text_reader.cc
+++ b/src/stl_text_reader.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -22,6 +22,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <vector>
+#include <iostream>
 
 using std::list;
 using std::ostream;
@@ -42,7 +43,7 @@ STLTextReader::STLTextReader (istream& in)
 	/* XXX: no idea what this should be */
 	_subtitle.vertical_position.lines = 32;
 	_subtitle.vertical_position.reference = TOP_OF_SCREEN;
-	
+
 	while (in.good ()) {
 		string line;
 		getline (in, line);
@@ -77,7 +78,7 @@ STLTextReader::STLTextReader (istream& in)
 			if (divider[0] != string::npos) {
 				divider[1] = line.find_first_of (",", divider[0] + 1);
 			}
-			
+
 			if (divider[0] == string::npos || divider[1] == string::npos || divider[0] <= 1 || divider[1] >= line.length() - 1) {
 				warn (String::compose ("Unrecognised line %1", line));
 				continue;
diff --git a/src/subrip_reader.cc b/src/subrip_reader.cc
index 644a23c..a8b41ae 100644
--- a/src/subrip_reader.cc
+++ b/src/subrip_reader.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -24,6 +24,7 @@
 #include <boost/regex.hpp>
 #include <cstdio>
 #include <vector>
+#include <iostream>
 
 using std::string;
 using std::vector;
diff --git a/test/dcp_reader_test.cc b/test/dcp_reader_test.cc
index d17d146..7fa419b 100644
--- a/test/dcp_reader_test.cc
+++ b/test/dcp_reader_test.cc
@@ -22,6 +22,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/optional/optional_io.hpp>
 #include <fstream>
+#include <iostream>
 
 using std::list;
 using std::cout;
diff --git a/test/iso6937_test.cc b/test/iso6937_test.cc
index f537230..ccb21f2 100644
--- a/test/iso6937_test.cc
+++ b/test/iso6937_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -18,8 +18,9 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <boost/locale.hpp>
 #include "iso6937.h"
+#include <boost/locale.hpp>
+#include <iostream>
 
 using std::cout;
 using boost::locale::conv::utf_to_utf;
diff --git a/test/stl_binary_reader_test.cc b/test/stl_binary_reader_test.cc
index 2c301ee..8645805 100644
--- a/test/stl_binary_reader_test.cc
+++ b/test/stl_binary_reader_test.cc
@@ -18,10 +18,11 @@
 */
 
 #include <boost/test/unit_test.hpp>
-#include <fstream>
 #include "stl_binary_reader.h"
 #include "subtitle.h"
 #include "test.h"
+#include <fstream>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -38,4 +39,3 @@ BOOST_AUTO_TEST_CASE (stl_binary_reader_test)
 	ifstream f (p.string().c_str ());
 	sub::STLBinaryReader r (f);
 }
-
diff --git a/tools/dumpsubs.cc b/tools/dumpsubs.cc
index fef3885..f69ecf8 100644
--- a/tools/dumpsubs.cc
+++ b/tools/dumpsubs.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 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
@@ -23,6 +23,7 @@
 #include <getopt.h>
 #include <boost/filesystem.hpp>
 #include <map>
+#include <iostream>
 
 using std::string;
 using std::cerr;
@@ -89,7 +90,7 @@ main (int argc, char* argv[])
 		for (list<sub::Line>::const_iterator j = i->lines.begin(); j != i->lines.end(); ++j) {
 
 			cout << "\t";
-			
+
 			if (j->vertical_position.proportional) {
 				cout << j->vertical_position.proportional.get() << " of screen";
 			} else if (j->vertical_position.line) {
@@ -130,7 +131,7 @@ main (int argc, char* argv[])
 
 				italic = k->italic;
 				underline = k->underline;
-					
+
 				cout << k->text;
 			}