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.

Sign up for GitHub

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

Fixes manual registration and segmentation demo for boost 1.57 #1063

Merged
merged 1 commit into from
Jan 5, 2015
Merged

Fixes manual registration and segmentation demo for boost 1.57 #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions apps/include/pcl/apps/manual_registration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
#include <QTimer>

// Boost
#ifndef Q_MOC_RUN
#include <boost/thread/thread.hpp>
#endif

// PCL
#include <pcl/console/print.h>
Expand Down
2 changes: 2 additions & 0 deletions common/include/pcl/common/time_trigger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@
#define PCL_COMMON_TIME_TRIGGER_H_

#include <pcl/pcl_macros.h>
#ifndef Q_MOC_RUN
#include <boost/function.hpp>
#include <boost/thread.hpp>
#include <boost/signals2.hpp>
#endif

namespace pcl
{
Expand Down
3 changes: 2 additions & 1 deletion segmentation/include/pcl/segmentation/boost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#pragma GCC system_header
#endif

#ifndef Q_MOC_RUN
// Marking all Boost headers as system headers to remove warnings
#include <boost/version.hpp>
#include <boost/make_shared.hpp>
Expand All @@ -55,6 +56,6 @@
#if (BOOST_VERSION >= 104400)
#include <boost/graph/boykov_kolmogorov_max_flow.hpp>
#endif

#endif

#endif // PCL_SEGMENTATION_BOOST_H_