Standard header cleanup.

Sanitize some standard headers, remove include directives of unused
headers, complete configure check for used standard headers.

diff --git a/acinclude.m4 b/acinclude.m4
index 99627aefc909c90a46be5c0b212785a5b2df848d..c66f3dda84be1cf96610da94f3319f812c182bf1 100644 (file)
--- 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 0295d015920e1807464d51c5df309e25abd82a7d..b629f066d26bcc72d89de1a39723892f10b6617b 100644 (file)
--- 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 8512a4c7157e7ee26e5179557ac745e0326cc47b..0e4d3754f063890dcf078eaec1c9cff2c0977152 100644 (file)
--- 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 e6bd91a7a98d0d38e0e83df4eca909063a9bdc7f..7168d279dfe1dfbc661cdf7aa618afc4007e5a86 100644 (file)
--- 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 32203183de73bcd6103e7aba9ca3793a97363630..9f16572618718a1b9819d9b8b7889db928bc6096 100644 (file)
--- 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 8f8c87e858340e625df38a3bffe1fb3cfc0356fa..e9b2569b57f6f654d7e1f48819d9c2c28f09cbf1 100644 (file)
--- 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 2d3882616aab6ccdf28ad36f3f7adf4e85a57305..03def530b367831683493d6ced3b592501aa6057 100644 (file)
--- 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 31527411645c8c30f0b5718fd271e6cdf15bbd14..85d13af666e25059c682df4e3e8f3abff0632c46 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -30,7 +30,6 @@
 #include "print.h"
 #include "utils.h"
 
-#include <iomanip>
 #include <iostream>
 
 namespace GiNaC {