From 792cda15eb0089edccdc0a89e7c39e58e940b87b Mon Sep 17 00:00:00 2001
From: Richard Kreckel <kreckel@ginac.de>
Date: Wed, 25 Nov 2015 15:17:20 +0100
Subject: [PATCH] Standard header cleanup.

Sanitize some standard headers, remove include directives of unused
headers, complete configure check for used standard headers.
---
 acinclude.m4        | 26 +++++++++++++++++++-------
 ginac/basic.h       |  2 --
 ginac/ex.h          |  1 +
 ginac/expairseq.cpp |  1 +
 ginac/expairseq.h   |  6 ------
 ginac/factor.cpp    |  1 +
 ginac/function.hppy |  2 --
 ginac/operators.cpp |  1 -
 8 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 99627aef..c66f3dda 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -29,23 +29,35 @@ AC_CACHE_CHECK([for standard C++ header files], [ginac_cv_std_cxx_headers], [
 	ginac_cv_std_cxx_headers="no"
 	AC_LANG_PUSH([C++])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+		#include <algorithm>
+		#include <cstring>
+		#include <cstddef>
+		#include <ctime>
+		#include <fstream>
+		#include <functional>
+		#include <iomanip>
+		#include <ios>
 		#include <iosfwd>
 		#include <iostream>
-		#include <vector>
+		#include <iterator>
+		#include <limits>
 		#include <list>
 		#include <map>
+		#include <memory>
+		#include <numeric>
+		#include <ostream>
 		#include <set>
-		#include <string>
 		#include <sstream>
-		#include <typeinfo>
+		#include <stack>
 		#include <stdexcept>
-		#include <algorithm>
-		#include <limits>
-		#include <ctime>
+		#include <string>
+		#include <typeinfo>
+		#include <utility>
+		#include <vector>
 		]])], [ginac_cv_std_cxx_headers="yes"])
 	AC_LANG_POP([C++])])
 if test "${ginac_cv_std_cxx_headers}" != "yes"; then
-	AC_MSG_ERROR([Standard ISO C++ 98 headers are missing])
+	AC_MSG_ERROR([Standard ISO C++ headers are missing])
 fi
 ])
 
diff --git a/ginac/basic.h b/ginac/basic.h
index 0295d015..b629f066 100644
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -28,8 +28,6 @@
 #include "assertion.h"
 #include "registrar.h"
 
-// CINT needs <algorithm> to work properly with <vector>
-#include <algorithm>
 #include <cstddef> // for size_t
 #include <map>
 #include <set>
diff --git a/ginac/ex.h b/ginac/ex.h
index 8512a4c7..0e4d3754 100644
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -29,6 +29,7 @@
 #include <functional>
 #include <iosfwd>
 #include <iterator>
+#include <memory>
 #include <stack>
 
 namespace GiNaC {
diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index e6bd91a7..7168d279 100644
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -37,6 +37,7 @@
 #include <algorithm>
 #include <iostream>
 #include <iterator>
+#include <memory>
 #include <stdexcept>
 #include <string>
 
diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index 32203183..9f165726 100644
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -26,18 +26,12 @@
 #include "expair.h"
 #include "indexed.h"
 
-// CINT needs <algorithm> to work properly with <vector> and <list>
-#include <algorithm>
-#include <list>
-#include <memory>
 #include <vector>
 
 namespace GiNaC {
 
 typedef std::vector<expair> epvector;       ///< expair-vector
 typedef epvector::iterator epp;             ///< expair-vector pointer
-typedef std::list<epp> epplist;             ///< list of expair-vector pointers
-typedef std::vector<epplist> epplistvector; ///< vector of epplist
 
 /** Complex conjugate every element of an epvector. Returns zero if this
  *  does not change anything. */
diff --git a/ginac/factor.cpp b/ginac/factor.cpp
index 8f8c87e8..e9b2569b 100644
--- a/ginac/factor.cpp
+++ b/ginac/factor.cpp
@@ -70,6 +70,7 @@
 #include <limits>
 #include <list>
 #include <vector>
+#include <stack>
 #ifdef DEBUGFACTOR
 #include <ostream>
 #endif
diff --git a/ginac/function.hppy b/ginac/function.hppy
index 2d388261..03def530 100644
--- a/ginac/function.hppy
+++ b/ginac/function.hppy
@@ -28,8 +28,6 @@
 
 #include "exprseq.h"
 
-// CINT needs <algorithm> to work properly with <vector>
-#include <algorithm>
 #include <string>
 #include <vector>
 
diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index 31527411..85d13af6 100644
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -30,7 +30,6 @@
 #include "print.h"
 #include "utils.h"
 
-#include <iomanip>
 #include <iostream>
 
 namespace GiNaC {
-- 
2.49.0