Skip to content

Commit

Permalink
Deprecate unneeded meta-headers (#4628)
Browse files Browse the repository at this point in the history
* Deprecate unneeded meta-headers
Deprecated the following:
pcl/common/boost.h, pcl/sample_consensus/boost.h, pcl/octree/boost.h, pcl/recognition/boost, pcl/features/boost, pcl/features/eigen.h, and correspondence_rejection_median_distance.hpp
  • Loading branch information
rabaho authored Mar 8, 2021
1 parent ef6d20d commit ff52165
Show file tree
Hide file tree
Showing 31 changed files with 20 additions and 34 deletions.
1 change: 1 addition & 0 deletions common/include/pcl/common/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#ifdef __GNUC__
#pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")

#ifndef Q_MOC_RUN
// Marking all Boost headers as system headers to remove warnings
Expand Down
2 changes: 1 addition & 1 deletion features/include/pcl/features/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@
#if defined __GNUC__
# pragma GCC system_header
#endif

PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")
#include <boost/property_map/property_map.hpp>
1 change: 0 additions & 1 deletion features/include/pcl/features/boundary.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

#pragma once

#include <pcl/features/eigen.h>
#include <pcl/features/feature.h>

namespace pcl
Expand Down
2 changes: 1 addition & 1 deletion features/include/pcl/features/eigen.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
#if defined __GNUC__
# pragma GCC system_header
#endif

PCL_DEPRECATED_HEADER(1, 15, "Please include the needed eigen headers directly.")
#include <Eigen/StdVector>
#include <Eigen/Geometry>
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include <pcl/kdtree/kdtree_flann.h>
#include <pcl/common/distances.h>
#include <pcl/console/print.h> // for PCL_INFO, PCL_ERROR
#include <pcl/features/boost.h>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/johnson_all_pairs_shortest.hpp>

Expand Down
1 change: 0 additions & 1 deletion features/include/pcl/features/narf.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

#include <pcl/memory.h>
#include <pcl/pcl_macros.h>
#include <pcl/features/eigen.h>
#include <pcl/point_cloud.h>
#include <pcl/point_representation.h>

Expand Down
1 change: 0 additions & 1 deletion features/include/pcl/features/principal_curvatures.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

#pragma once

#include <pcl/features/eigen.h>
#include <pcl/features/feature.h>

namespace pcl
Expand Down
2 changes: 1 addition & 1 deletion filters/include/pcl/filters/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#ifdef __GNUC__
#pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")

// Marking all Boost headers as system headers to remove warnings
#include <boost/random.hpp>
Expand Down
2 changes: 1 addition & 1 deletion geometry/include/pcl/geometry/eigen.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#ifdef __GNUC__
#pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed eigen headers directly.")

#include <Eigen/Core>
#include <Eigen/StdVector>
2 changes: 1 addition & 1 deletion io/include/pcl/io/eigen.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed eigen headers directly.")

#include <Eigen/Core>
1 change: 1 addition & 0 deletions octree/include/pcl/octree/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#ifdef __GNUC__
#pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")

// Marking all Boost headers as system headers to remove warnings
#include <boost/graph/adjacency_list.hpp>
1 change: 1 addition & 0 deletions recognition/include/pcl/recognition/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")

#include <boost/graph/graph_traits.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -203,5 +203,3 @@ class PCL_EXPORTS CorrespondenceRejectorDistance : public CorrespondenceRejector

} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_distance.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,3 @@ class PCL_EXPORTS CorrespondenceRejectorMedianDistance : public CorrespondenceRe
};
} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_median_distance.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,3 @@ class PCL_EXPORTS CorrespondenceRejectorOneToOne : public CorrespondenceRejector

} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_one_to_one.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -150,5 +150,3 @@ class PCL_EXPORTS CorrespondenceRejectionOrganizedBoundary
};
} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_organized_boundary.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -351,5 +351,3 @@ class PCL_EXPORTS CorrespondenceRejectorSurfaceNormal : public CorrespondenceRej
};
} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_surface_normal.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,3 @@ class PCL_EXPORTS CorrespondenceRejectorTrimmed : public CorrespondenceRejector

} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_trimmed.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -260,5 +260,3 @@ class PCL_EXPORTS CorrespondenceRejectorVarTrimmed : public CorrespondenceReject
};
} // namespace registration
} // namespace pcl

#include <pcl/registration/impl/correspondence_rejection_var_trimmed.hpp>
2 changes: 1 addition & 1 deletion registration/include/pcl/registration/eigen.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#if defined __GNUC__
#pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed eigen headers directly.")

#include <Eigen/Core>
#include <Eigen/Dense>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
*/
#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_DISTANCE_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_DISTANCE_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif /* PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_DISTANCE_HPP_ */
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
*/
#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_MEDIAN_DISTANCE_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_MEDIAN_DISTANCE_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif // PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_MEDIAN_DISTANCE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
*/
#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_ONE_TO_ONE_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_ONE_TO_ONE_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif /* PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_ONE_TO_ONE_HPP_ */
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@

#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_ORGANIZED_BOUNDARY_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_ORGANIZED_BOUNDARY_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif /* PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_ORGANIZED_BOUNDARY_HPP_ */
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
*/
#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_SURFACE_NORMAL_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_SURFACE_NORMAL_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif /* PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_SURFACE_NORMAL_HPP_ */
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
*/
#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_TRIMMED_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_TRIMMED_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif /* PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_TRIMMED_HPP_ */
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@
*/
#ifndef PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_VAR_TRIMMED_HPP_
#define PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_VAR_TRIMMED_HPP_

PCL_DEPRECATED_HEADER(1, 15, "")
#endif /* PCL_REGISTRATION_IMPL_CORRESPONDENCE_REJECTION_VAR_TRIMMED_HPP_ */
1 change: 1 addition & 0 deletions sample_consensus/include/pcl/sample_consensus/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")

#include <boost/random.hpp>
2 changes: 1 addition & 1 deletion surface/include/pcl/surface/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed boost headers directly.")

#include <boost/dynamic_bitset/dynamic_bitset.hpp>
2 changes: 1 addition & 1 deletion surface/include/pcl/surface/eigen.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed eigen headers directly.")

#include <Eigen/SVD>
2 changes: 1 addition & 1 deletion visualization/include/pcl/visualization/eigen.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
PCL_DEPRECATED_HEADER(1, 15, "")
PCL_DEPRECATED_HEADER(1, 15, "Please include the needed eigen headers directly.")

#include <Eigen/Geometry>
#include <Eigen/Dense>

0 comments on commit ff52165

Please sign in to comment.