Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove boost shared pointer usage and headers in favor of pcl/memory.h #3893

Merged
merged 1 commit into from
Apr 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/include/pcl/Vertices.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include <pcl/memory.h>
#include <pcl/pcl_macros.h>

#include <string>
#include <vector>
#include <ostream>
#include <boost/shared_ptr.hpp>
#include <pcl/memory.h>
#include <pcl/pcl_macros.h>

namespace pcl
{
Expand Down
2 changes: 0 additions & 2 deletions common/include/pcl/common/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
#ifndef Q_MOC_RUN
// Marking all Boost headers as system headers to remove warnings
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
#include <boost/mpl/size.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/signals2.hpp>
Expand Down
1 change: 0 additions & 1 deletion common/include/pcl/pcl_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include <pcl/memory.h>
#include <pcl/pcl_macros.h>

#include <boost/shared_ptr.hpp>
#include <Eigen/StdVector>
#include <Eigen/Core>

Expand Down
10 changes: 5 additions & 5 deletions cuda/apps/src/kinect_debayering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@
*
*/

#include <pcl_cuda/io/cloud_to_pcl.h>
#include <pcl_cuda/io/debayering.h>
#include <pcl_cuda/time_cpu.h>
#include <pcl/memory.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/debayering.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/io/kinect_grabber.h>

#include <opencv2/opencv.hpp>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


class SimpleKinectTool
{
public:
Expand Down
17 changes: 8 additions & 9 deletions cuda/apps/src/kinect_dediscretize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,22 @@
*
*/

#include <pcl_cuda/io/cloud_to_pcl.h>
#include <pcl_cuda/io/disparity_to_cloud.h>
#include <pcl_cuda/sample_consensus/sac_model_plane.h>
#include <pcl_cuda/sample_consensus/ransac.h>
#include <pcl_cuda/time_cpu.h>

#include <pcl/io/openni_grabber.h>
#include <pcl/memory.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/disparity_to_cloud.h>
#include <pcl/cuda/sample_consensus/ransac.h>
#include <pcl/cuda/sample_consensus/sac_model_plane.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/io/openni_grabber.h>
#include <pcl/visualization/cloud_viewer.h>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


class SimpleKinectTool
{
public:
Expand Down
32 changes: 16 additions & 16 deletions cuda/apps/src/kinect_mapping.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,37 @@
*
*/

#include <pcl_cuda/io/cloud_to_pcl.h>
#include <pcl_cuda/io/extract_indices.h>
#include <pcl_cuda/io/disparity_to_cloud.h>
#include <pcl_cuda/sample_consensus/sac_model_1point_plane.h>
#include <pcl_cuda/sample_consensus/multi_ransac.h>
#include <pcl_cuda/segmentation/connected_components.h>
#include <pcl_cuda/time_cpu.h>
#include <pcl_cuda/time_gpu.h>

#include <pcl/memory.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/common/transform.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/disparity_to_cloud.h>
#include <pcl/cuda/io/extract_indices.h>
#include <pcl/cuda/sample_consensus/multi_ransac.h>
#include <pcl/cuda/sample_consensus/sac_model_1point_plane.h>
#include <pcl/cuda/segmentation/connected_components.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/cuda/time_gpu.h>
#include <pcl/io/openni_grabber.h>
#include <pcl/io/pcd_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/visualization/point_cloud_handlers.h>
#include <pcl/visualization/pcl_visualizer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/visualization/point_cloud_handlers.h>

#include <opencv2/opencv.hpp>
#include <opencv2/gpu/gpu.hpp>
#include <boost/filesystem.hpp>

#include <Eigen/Core>
#include <Eigen/Geometry>

#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include <opencv2/opencv.hpp>
#include <opencv2/gpu/gpu.hpp>

#include <functional>
#include <iostream>
#include <mutex>


using namespace pcl_cuda;

template <template <typename> class Storage>
Expand Down
10 changes: 5 additions & 5 deletions cuda/apps/src/kinect_normals_cuda.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
*
*/

#include <pcl/memory.h>
#include <pcl/pcl_macros.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/features/normal_3d.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/cuda/time_gpu.h>
Expand All @@ -45,19 +49,15 @@
#include <pcl/io/openni_grabber.h>
#include <pcl/io/pcd_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/pcl_macros.h>

#include <opencv2/opencv.hpp>
#include <opencv2/gpu/gpu.hpp>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


using namespace pcl::cuda;

class NormalEstimation
Expand Down
25 changes: 12 additions & 13 deletions cuda/apps/src/kinect_ransac.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,26 @@
*
*/

#include <pcl_cuda/time_cpu.h>
#include <pcl_cuda/time_gpu.h>
#include <pcl_cuda/io/cloud_to_pcl.h>
#include <pcl_cuda/io/extract_indices.h>
#include <pcl_cuda/io/disparity_to_cloud.h>
#include <pcl_cuda/io/host_device.h>
#include <pcl_cuda/sample_consensus/sac_model_1point_plane.h>
#include <pcl_cuda/sample_consensus/ransac.h>

#include <pcl/memory.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/cuda/time_gpu.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/disparity_to_cloud.h>
#include <pcl/cuda/io/extract_indices.h>
#include <pcl/cuda/io/host_device.h>
#include <pcl/cuda/sample_consensus/ransac.h>
#include <pcl/cuda/sample_consensus/sac_model_1point_plane.h>
#include <pcl/io/openni_grabber.h>
#include <pcl/io/pcd_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


using namespace pcl_cuda;

class SimpleKinectTool
Expand Down
10 changes: 5 additions & 5 deletions cuda/apps/src/kinect_segmentation_cuda.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
*
*/

#include <pcl/memory.h>
#include <pcl/pcl_macros.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/features/normal_3d.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/cuda/time_gpu.h>
Expand All @@ -48,20 +52,16 @@
#include <pcl/io/openni_grabber.h>
#include <pcl/io/pcd_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/pcl_macros.h>

#include <opencv2/highgui/highgui.hpp>
#include <opencv2/highgui/highgui_c.h>
#include <opencv2/gpu/gpu.hpp>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


using namespace pcl::cuda;

template <template <typename> class Storage>
Expand Down
14 changes: 7 additions & 7 deletions cuda/apps/src/kinect_segmentation_planes_cuda.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,31 @@
*
*/

#include <pcl/cuda/features/normal_3d.h>
#include <pcl/memory.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/cuda/time_gpu.h>
#include <pcl/cuda/features/normal_3d.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/extract_indices.h>
#include <pcl/cuda/io/disparity_to_cloud.h>
#include <pcl/cuda/io/extract_indices.h>
#include <pcl/cuda/io/host_device.h>
#include <pcl/cuda/segmentation/connected_components.h>
#include <pcl/cuda/segmentation/mssegmentation.h>
#include <pcl/io/openni_grabber.h>
#include <pcl/io/pcd_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>

#include <opencv2/highgui/highgui.hpp>
#include <opencv2/gpu/gpu.hpp>

#include <boost/shared_ptr.hpp>

#include <iostream>
#include <fstream>
#include <functional>
#include <iostream>
#include <mutex>


using namespace pcl::cuda;

template <template <typename> class Storage>
Expand Down
8 changes: 4 additions & 4 deletions cuda/apps/src/kinect_tool_standalone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@
*
*/

#include <pcl/memory.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/disparity_to_cloud.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/io/openni_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


using pcl::cuda::PointCloudAOS;
using pcl::cuda::Device;
using pcl::cuda::Host;
Expand Down
8 changes: 4 additions & 4 deletions cuda/apps/src/kinect_viewer_cuda.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@
*
*/

#include <pcl/memory.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>
#include <pcl/cuda/io/cloud_to_pcl.h>
#include <pcl/cuda/io/disparity_to_cloud.h>
#include <pcl/cuda/time_cpu.h>
#include <pcl/io/openni_grabber.h>
#include <pcl/visualization/cloud_viewer.h>
#include <pcl/point_cloud.h>
#include <pcl/point_types.h>

#include <boost/shared_ptr.hpp>

#include <functional>
#include <iostream>
#include <mutex>


using pcl::cuda::PointCloudAOS;
using pcl::cuda::Device;

Expand Down
3 changes: 2 additions & 1 deletion cuda/common/include/pcl/cuda/pcl_cuda_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@

#pragma once

#include <boost/shared_ptr.hpp>
#include <pcl/memory.h>
#include <pcl/cuda/point_cloud.h>


namespace pcl
{
namespace cuda
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/content/sources/iccv2011/include/surface.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Mesh
std::vector<pcl::Vertices> faces;
};

typedef boost::shared_ptr<Mesh> MeshPtr;
using MeshPtr = std::shared_ptr<Mesh>;

PointCloudPtr
smoothPointCloud (const PointCloudPtr & input, float radius, int polynomial_order)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Mesh
std::vector<pcl::Vertices> faces;
};

typedef boost::shared_ptr<Mesh> MeshPtr;
using MeshPtr = std::shared_ptr<Mesh>;

PointCloudPtr
smoothPointCloud (const PointCloudPtr & input, float radius, int polynomial_order)
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials/content/sources/iros2011/include/surface.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Mesh
std::vector<pcl::Vertices> faces;
};

typedef boost::shared_ptr<Mesh> MeshPtr;
using MeshPtr = std::shared_ptr<Mesh>;

PointCloudPtr
smoothPointCloud (const PointCloudPtr & input, float radius, int polynomial_order)
Expand Down
3 changes: 2 additions & 1 deletion features/include/pcl/features/integral_image2D.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@

#pragma once

#include <pcl/memory.h>

#include <vector>

#include <boost/shared_ptr.hpp>

namespace pcl
{
Expand Down
2 changes: 0 additions & 2 deletions filters/include/pcl/filters/boost.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
// Marking all Boost headers as system headers to remove warnings
#include <boost/random.hpp>
#include <boost/random/normal_distribution.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
#include <boost/dynamic_bitset.hpp>
#include <boost/mpl/size.hpp>
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
Expand Down
Loading