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

Jump to bottom

Add necessary boost headers to pcl/io to build in CUDA mode #2025

Merged
merged 4 commits into from
Oct 18, 2017
Merged

Add necessary boost headers to pcl/io to build in CUDA mode #2025

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a824b0
Add necessary boost headers to pcl/io to build in CUDA mode
bowang Oct 14, 2017
fedbe07
Move inclusion of boost headers into boost.h
bowang Oct 14, 2017
c3143f2
Restructure io/include/pcl/io/boost.h
bowang Oct 15, 2017
f265aff
Remove indention
bowang Oct 16, 2017
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
8 changes: 3 additions & 5 deletions io/include/pcl/io/boost.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
#if defined __GNUC__
# pragma GCC system_header
#endif
#ifndef __CUDACC__
//https://bugreports.qt-project.org/browse/QTBUG-22829
#ifndef Q_MOC_RUN
#ifndef __CUDACC__
#include <boost/version.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/thread/mutex.hpp>
Expand All @@ -63,17 +63,13 @@
#include <boost/mpl/joint_view.hpp>
#include <boost/mpl/transform.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/algorithm/string.hpp>
#ifndef Q_MOC_RUN
#include <boost/date_time/posix_time/posix_time.hpp>
#endif
#if BOOST_VERSION >= 104700
#include <boost/chrono.hpp>
#endif
#include <boost/tokenizer.hpp>
#include <boost/foreach.hpp>
#include <boost/shared_array.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#if BOOST_VERSION >= 104900
#include <boost/interprocess/permissions.hpp>
#endif
Expand All @@ -82,6 +78,8 @@
#include <boost/signals2.hpp>
#include <boost/signals2/slot.hpp>
#endif
#include <boost/algorithm/string.hpp>
#include <boost/interprocess/sync/file_lock.hpp>
#endif
#endif // _PCL_IO_BOOST_H_