Merge pull request #608 from lsst/tickets/DM-30777

DM-30777: remove unused includes
lsst · Sep 23, 2021 · 5ddfab5 · 5ddfab5
2 parents d62ef0f + f003c66
commit 5ddfab5
Show file tree

Hide file tree

Showing 100 changed files with 34 additions and 310 deletions.
diff --git a/examples/integrateCartesian.cc b/examples/integrateCartesian.cc
@@ -28,9 +28,6 @@
  *
  */
 #include <iostream>
-#include <vector>
-#include <cmath>
-#include <functional>
 
 #include "lsst/afw/math/Integrate.h"
 

diff --git a/examples/integrateExample.cc b/examples/integrateExample.cc
@@ -36,7 +36,7 @@
 
 #include <iostream>
 #include <stdexcept>
-#include <limits>
+#include <cmath>
 
 #include "lsst/afw/math/Integrate.h"
 

diff --git a/examples/integratePolar.cc b/examples/integratePolar.cc
@@ -27,9 +27,6 @@
  * integrator (afw::math Quadrature) with a polar function.
  */
 #include <iostream>
-#include <vector>
-#include <cmath>
-#include <functional>
 
 #include "lsst/afw/math/Integrate.h"
 

diff --git a/examples/lanczosKernel.cc b/examples/lanczosKernel.cc
@@ -21,8 +21,8 @@
  */
 
 #include <iostream>
+#include <vector>
 
-#include <memory>
 #include "boost/format.hpp"
 
 #include "lsst/afw/math/FunctionLibrary.h"

diff --git a/examples/mask.cc b/examples/mask.cc
@@ -23,6 +23,7 @@
 #include <cstdio>
 #include <string>
 #include <algorithm>
+#include <iostream>
 
 #include "lsst/geom.h"
 #include "lsst/utils/packaging.h"

diff --git a/examples/simpleConvolve.cc b/examples/simpleConvolve.cc
@@ -20,7 +20,6 @@
  * see <http://www.lsstcorp.org/LegalNotices/>.
  */
 
-#include <iostream>
 #include <sstream>
 #include <string>
 

diff --git a/examples/spatialCellExample.cc b/examples/spatialCellExample.cc
@@ -30,8 +30,8 @@
 #include "lsst/utils/packaging.h"
 #include "lsst/pex/exceptions.h"
 #include "lsst/daf/base.h"
-#include "lsst/afw/detection.h"
 #include "lsst/afw/image.h"
+#include "lsst/afw/detection.h"
 #include "lsst/afw/math.h"
 
 #include "testSpatialCell.h"

diff --git a/examples/spatiallyVaryingConvolve.cc b/examples/spatiallyVaryingConvolve.cc
@@ -21,7 +21,8 @@
  */
 
 #include <iostream>
-#include <sstream>
+#include <vector>
+#include <string>
 
 #include "lsst/utils/packaging.h"
 #include "lsst/pex/exceptions.h"

diff --git a/examples/timeConvolve.cc b/examples/timeConvolve.cc
@@ -20,7 +20,6 @@
  * see <http://www.lsstcorp.org/LegalNotices/>.
  */
 
-#include <iostream>
 #include <sstream>
 #include <ctime>
 

diff --git a/examples/timeImageAddition.cc b/examples/timeImageAddition.cc
@@ -22,7 +22,6 @@
  * see <http://www.lsstcorp.org/LegalNotices/>.
  */
 
-#include <iostream>
 #include <sstream>
 #include <ctime>
 

diff --git a/examples/timeImageIterators.cc b/examples/timeImageIterators.cc
@@ -20,7 +20,6 @@
  * see <http://www.lsstcorp.org/LegalNotices/>.
  */
 
-#include <iostream>
 #include <sstream>
 #include <ctime>
 #include <valarray>

diff --git a/examples/timeWcs.cc b/examples/timeWcs.cc
@@ -21,7 +21,6 @@
  */
 
 #include <iostream>
-#include <sstream>
 #include <ctime>
 #include <cmath>
 

diff --git a/include/lsst/afw/cameraGeom/Orientation.h b/include/lsst/afw/cameraGeom/Orientation.h
@@ -28,7 +28,6 @@
 #include "Eigen/Dense"
 #include "lsst/geom.h"
 #include "lsst/afw/geom/Transform.h"
-#include "lsst/afw/image/Utils.h"
 
 /*
  * Describe a Detector's orientation

diff --git a/include/lsst/afw/geom/ellipses/Convolution.h b/include/lsst/afw/geom/ellipses/Convolution.h
@@ -31,8 +31,6 @@
  *  Note: do not include directly; use the main ellipse header file.
  */
 
-#include <boost/tuple/tuple.hpp>
-
 #include "lsst/afw/geom/ellipses/Ellipse.h"
 
 namespace lsst {

diff --git a/include/lsst/afw/image/Image.h b/include/lsst/afw/image/Image.h
@@ -31,22 +31,15 @@
 #define LSST_AFW_IMAGE_IMAGE_H
 
 #include <string>
-#include <utility>
-#include <functional>
 
-#include "boost/mpl/bool.hpp"
 #include <climits>
 #include <memory>
 
 #include "lsst/geom.h"
 #include "lsst/afw/image/ImageBase.h"
-#include "lsst/afw/image/lsstGil.h"
-#include "lsst/afw/image/ImageUtils.h"
 #include "lsst/afw/image/Mask.h"
 #include "lsst/afw/math/Function.h"
-#include "lsst/afw/fitsDefaults.h"
 #include "lsst/daf/base/PropertySet.h"
-#include "lsst/pex/exceptions.h"
 #include "ndarray.h"
 
 namespace lsst {

diff --git a/include/lsst/afw/image/ImageAlgorithm.h b/include/lsst/afw/image/ImageAlgorithm.h
@@ -34,12 +34,9 @@
 #include <utility>
 #include <functional>
 
-#include "boost/mpl/bool.hpp"
+#include "boost/format.hpp"
 #include <memory>
 
-#include "lsst/afw/image/lsstGil.h"
-#include "lsst/afw/image/ImageUtils.h"
-#include "lsst/daf/base.h"
 #include "lsst/pex/exceptions.h"
 
 namespace lsst {

diff --git a/include/lsst/afw/image/ImagePca.h b/include/lsst/afw/image/ImagePca.h
@@ -32,7 +32,6 @@
 #include <string>
 #include <utility>
 
-#include "boost/mpl/bool.hpp"
 #include <memory>
 
 #include "lsst/pex/exceptions.h"

diff --git a/include/lsst/afw/image/Utils.h b/include/lsst/afw/image/Utils.h
diff --git a/include/lsst/afw/image/lsstGil.h b/include/lsst/afw/image/lsstGil.h
@@ -40,20 +40,8 @@
 #include "boost/mpl/bool.hpp"
 #include "boost/mpl/if.hpp"
 
-//#define BOOST_GIL_USE_CONCEPT_CHECK 1
 
-#if defined(__ICC)
-#pragma warning(push)
-#pragma warning(disable : 68)
-#pragma warning(disable : 304)
-#endif
-
-#include "boost/version.hpp"
-#if BOOST_VERSION < 106900
-#include "boost/gil/gil_all.hpp"
-#else
 #include "boost/gil.hpp"
-#endif
 
 #ifndef BOOST_GIL_DEFINE_BASE_TYPEDEFS
 // Boost >=1.72 redefines GIL_ -> BOOST_GIL
@@ -62,9 +50,6 @@
 #define BOOST_GIL_DEFINE_ALL_TYPEDEFS_INTERNAL GIL_DEFINE_ALL_TYPEDEFS_INTERNAL
 #endif
 
-#if defined(__ICC)
-#pragma warning(pop)
-#endif
 
 namespace lsst {
 namespace afw {
@@ -248,19 +233,12 @@ namespace detail {
 //
 // Map typenames to gil's types
 //
-#if defined(__ICC)
-#pragma warning(push)
-#pragma warning(disable : 304)
-#endif
 
 template <typename T, bool rescale = false>
 struct types_traits {
     BOOST_MPL_ASSERT_MSG(boost::mpl::bool_<false>::value, I_DO_NOT_KNOW_HOW_TO_MAP_THIS_TYPE_TO_A_GIL_TYPE,
                          ());
 };
-#if defined(__ICC)
-#pragma warning(pop)
-#endif
 
 template <>
 struct types_traits<unsigned char, false> {

diff --git a/include/lsst/afw/math/Kernel.h b/include/lsst/afw/math/Kernel.h
@@ -32,11 +32,10 @@
 #include <utility>
 #include <vector>
 
-#include "boost/mpl/or.hpp"
+#include "boost/format.hpp"
 
 #include "lsst/geom.h"
 #include "lsst/afw/image/Image.h"
-#include "lsst/afw/image/Utils.h"
 #include "lsst/afw/math/Function.h"
 #include "lsst/afw/math/traits.h"
 

diff --git a/include/lsst/afw/math/Statistics.h b/include/lsst/afw/math/Statistics.h
@@ -38,7 +38,6 @@
 #include <cassert>
 #include <limits>
 #include "boost/iterator/iterator_adaptor.hpp"
-#include "boost/tuple/tuple.hpp"
 #include <memory>
 #include "lsst/afw/image/MaskedImage.h"
 #include "lsst/afw/math/MaskedVector.h"

diff --git a/include/lsst/afw/table/FieldBase.h b/include/lsst/afw/table/FieldBase.h
@@ -5,8 +5,6 @@
 #include <cstring>
 #include <iostream>
 
-#include "boost/mpl/vector.hpp"
-#include "boost/preprocessor/punctuation/paren.hpp"
 #include "Eigen/Core"
 
 #include "lsst/base.h"

diff --git a/include/lsst/afw/table/Source.h b/include/lsst/afw/table/Source.h
@@ -24,8 +24,6 @@
 #ifndef AFW_TABLE_Source_h_INCLUDED
 #define AFW_TABLE_Source_h_INCLUDED
 
-#include "boost/array.hpp"
-#include "boost/type_traits/is_convertible.hpp"
 
 #include "lsst/afw/detection/Footprint.h"
 #include "lsst/afw/table/Simple.h"

diff --git a/include/lsst/afw/table/misc.h b/include/lsst/afw/table/misc.h
@@ -4,7 +4,6 @@
 
 #include <cstdint>
 
-#include "boost/mpl/if.hpp"
 
 #include "lsst/geom/Angle.h"
 #include "lsst/geom/SpherePoint.h"

diff --git a/src/cameraGeom/TransformMap.cc b/src/cameraGeom/TransformMap.cc
@@ -24,7 +24,6 @@
 
 #include "lsst/log/Log.h"
 #include "lsst/pex/exceptions.h"
-#include "lsst/afw/table/io/InputArchive.h"
 #include "lsst/afw/table/io/OutputArchive.h"
 #include "lsst/afw/table/io/CatalogVector.h"
 #include "lsst/afw/table/io/Persistable.cc"

diff --git a/src/coord/Observatory.cc b/src/coord/Observatory.cc
@@ -22,8 +22,8 @@
  * see <http://www.lsstcorp.org/LegalNotices/>.
  */
 
-#include <sstream>
 #include <string>
+#include <iostream>
 
 #include "boost/format.hpp"
 

diff --git a/src/detection/FootprintMerge.cc b/src/detection/FootprintMerge.cc
@@ -21,9 +21,7 @@
  */
 #include <cstdint>
 
-
 #include "lsst/afw/detection/FootprintMerge.h"
-#include "lsst/afw/detection/FootprintSet.h"
 #include "lsst/afw/table/IdFactory.h"
 
 namespace lsst {

diff --git a/src/detection/FootprintSet.cc b/src/detection/FootprintSet.cc
@@ -45,7 +45,9 @@
 #include <cassert>
 #include <set>
 #include <string>
-#include <typeinfo>
+#include <map>
+#include <vector>
+
 #include "boost/format.hpp"
 #include "lsst/pex/exceptions.h"
 #include "lsst/afw/image/MaskedImage.h"

diff --git a/src/detection/GaussianPsf.cc b/src/detection/GaussianPsf.cc
@@ -26,7 +26,6 @@
 #include "ndarray/eigen.h"
 
 #include "lsst/afw/detection/GaussianPsf.h"
-#include "lsst/afw/table/io/InputArchive.h"
 #include "lsst/afw/table/io/OutputArchive.h"
 #include "lsst/afw/table/io/CatalogVector.h"
 #include "lsst/afw/table/aggregates.h"