Standard header cleanup.
authorRichard Kreckel <kreckel@ginac.de>
Wed, 25 Nov 2015 14:17:20 +0000 (15:17 +0100)
committerRichard Kreckel <kreckel@ginac.de>
Wed, 25 Nov 2015 14:17:20 +0000 (15:17 +0100)
Sanitize some standard headers, remove include directives of unused
headers, complete configure check for used standard headers.

acinclude.m4
ginac/basic.h
ginac/ex.h
ginac/expairseq.cpp
ginac/expairseq.h
ginac/factor.cpp
ginac/function.hppy
ginac/operators.cpp

index 99627ae..c66f3dd 100644 (file)
@@ -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
 ])
 
index 0295d01..b629f06 100644 (file)
@@ -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>
index 8512a4c..0e4d375 100644 (file)
@@ -29,6 +29,7 @@
 #include <functional>
 #include <iosfwd>
 #include <iterator>
+#include <memory>
 #include <stack>
 
 namespace GiNaC {
index e6bd91a..7168d27 100644 (file)
@@ -37,6 +37,7 @@
 #include <algorithm>
 #include <iostream>
 #include <iterator>
+#include <memory>
 #include <stdexcept>
 #include <string>
 
index 3220318..9f16572 100644 (file)
 #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. */
index 8f8c87e..e9b2569 100644 (file)
@@ -70,6 +70,7 @@
 #include <limits>
 #include <list>
 #include <vector>
+#include <stack>
 #ifdef DEBUGFACTOR
 #include <ostream>
 #endif
index 2d38826..03def53 100644 (file)
@@ -28,8 +28,6 @@
 
 #include "exprseq.h"
 
-// CINT needs <algorithm> to work properly with <vector>
-#include <algorithm>
 #include <string>
 #include <vector>
 
index 3152741..85d13af 100644 (file)
@@ -30,7 +30,6 @@
 #include "print.h"
 #include "utils.h"
 
-#include <iomanip>
 #include <iostream>
 
 namespace GiNaC {