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

Replace BOOST_MPL_ASSERT by static_assert #5525

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −24
Open

Replace BOOST_MPL_ASSERT by static_assert #5525

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
5 changes: 2 additions & 3 deletions common/include/pcl/common/concatenate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ namespace pcl
using InT = typename pcl::traits::datatype<PointInT, Key>::type;
using OutT = typename pcl::traits::datatype<PointOutT, Key>::type;
// Note: don't currently support different types for the same field (e.g. converting double to float)
BOOST_MPL_ASSERT_MSG ((std::is_same<InT, OutT>::value),
POINT_IN_AND_POINT_OUT_HAVE_DIFFERENT_TYPES_FOR_FIELD,
(Key, PointInT&, InT, PointOutT&, OutT));
static_assert(std::is_same<InT, OutT>::value,
"PointInT and PointOutT have different types for field.");
memcpy (reinterpret_cast<std::uint8_t*>(&p2_) + pcl::traits::offset<PointOutT, Key>::value,
reinterpret_cast<const std::uint8_t*>(&p1_) + pcl::traits::offset<PointInT, Key>::value,
sizeof (InT));
Expand Down
4 changes: 2 additions & 2 deletions common/include/pcl/for_each_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include <boost/mpl/begin_end.hpp>
#include <boost/mpl/next_prior.hpp>
#include <boost/mpl/deref.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/remove_if.hpp>
#include <boost/mpl/contains.hpp>
#include <boost/mpl/not.hpp>
Expand Down Expand Up @@ -90,7 +89,8 @@ namespace pcl
template<typename Sequence, typename F> inline void
for_each_type (F f)
{
BOOST_MPL_ASSERT (( boost::mpl::is_sequence<Sequence> ));
larshg marked this conversation as resolved.
Show resolved Hide resolved
static_assert(boost::mpl::is_sequence<Sequence>::type::value,
"Given type is not a valid sequence.");
using first = typename boost::mpl::begin<Sequence>::type;
using last = typename boost::mpl::end<Sequence>::type;
for_each_type_impl<std::is_same<first, last>::value>::template execute<first, last, F> (f);
Expand Down
19 changes: 9 additions & 10 deletions common/include/pcl/point_struct_traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,14 @@

#pragma once

#include <boost/mpl/assert.hpp> // for BOOST_MPL_ASSERT_MSG
#include <boost/mpl/identity.hpp> // for boost::mpl::identity

#include <boost/mpl/vector.hpp> // for boost::mpl::vector
#include <boost/preprocessor/seq/enum.hpp> // for BOOST_PP_SEQ_ENUM
#include <boost/preprocessor/tuple/elem.hpp> // for BOOST_PP_TUPLE_ELEM
#include <boost/preprocessor/stringize.hpp> // for BOOST_PP_STRINGIZE

// This is required for the workaround at line 84
// This is required for the MSVC workaround below
#ifdef _MSC_VER
#include <Eigen/Core>
#include <Eigen/src/StlSupport/details.h>
Expand Down Expand Up @@ -111,8 +110,8 @@ struct name /** \cond NO_WARN_RECURSIVE */ : name<typename POD<PointT>::type, Ta
// static const char value[];

// Avoid infinite compile-time recursion
BOOST_MPL_ASSERT_MSG((!std::is_same<PointT, typename POD<PointT>::type>::value),
POINT_TYPE_NOT_PROPERLY_REGISTERED, (PointT&));
static_assert(!std::is_same<PointT, typename POD<PointT>::type>::value,
"Point type not properly registered.");
};
} // namespace traits
} // namespace pcl
Expand Down Expand Up @@ -143,8 +142,8 @@ struct offset /** \cond NO_WARN_RECURSIVE */ : offset<typename POD<PointT>::type
// static const std::size_t value;

// Avoid infinite compile-time recursion
BOOST_MPL_ASSERT_MSG((!std::is_same<PointT, typename POD<PointT>::type>::value),
POINT_TYPE_NOT_PROPERLY_REGISTERED, (PointT&));
static_assert(!std::is_same<PointT, typename POD<PointT>::type>::value,
"Point type not properly registered.");
};
} // namespace traits
} // namespace pcl
Expand All @@ -170,8 +169,8 @@ namespace traits
// static const std::uint32_t size;

// Avoid infinite compile-time recursion
BOOST_MPL_ASSERT_MSG((!std::is_same<PointT, typename POD<PointT>::type>::value),
POINT_TYPE_NOT_PROPERLY_REGISTERED, (PointT&));
static_assert(!std::is_same<PointT, typename POD<PointT>::type>::value,
"Point type not properly registered.");
};
} // namespace traits
} // namespace pcl
Expand All @@ -198,8 +197,8 @@ struct fieldList /** \cond NO_WARN_RECURSIVE */ : fieldList<typename POD<PointT>
// using type = boost::mpl::vector<...>;

// Avoid infinite compile-time recursion
BOOST_MPL_ASSERT_MSG((!std::is_same<PointT, typename POD<PointT>::type>::value),
POINT_TYPE_NOT_PROPERLY_REGISTERED, (PointT&));
static_assert(!std::is_same<PointT, typename POD<PointT>::type>::value,
"Point type not properly registered.");
};
} // namespace traits
} // namespace pcl
Expand Down
16 changes: 7 additions & 9 deletions common/include/pcl/register_point_struct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
#endif

#include <pcl/point_struct_traits.h> // for pcl::traits::POD, POINT_CLOUD_REGISTER_FIELD_(NAME, OFFSET, DATATYPE), POINT_CLOUD_REGISTER_POINT_FIELD_LIST
#include <boost/mpl/assert.hpp> // for BOOST_MPL_ASSERT_MSG
#include <boost/preprocessor/seq/for_each.hpp> // for BOOST_PP_SEQ_FOR_EACH
#include <boost/preprocessor/seq/transform.hpp> // for BOOST_PP_SEQ_TRANSFORM
#include <boost/preprocessor/tuple/elem.hpp> // for BOOST_PP_TUPLE_ELEM
Expand All @@ -66,12 +65,13 @@
BOOST_PP_CAT(POINT_CLOUD_REGISTER_POINT_STRUCT_X fseq, 0))
/***/

#define POINT_CLOUD_REGISTER_POINT_WRAPPER(wrapper, pod) \
BOOST_MPL_ASSERT_MSG(sizeof(wrapper) == sizeof(pod), POINT_WRAPPER_AND_POD_TYPES_HAVE_DIFFERENT_SIZES, (wrapper&, pod&)); \
namespace pcl { \
namespace traits { \
template<> struct POD<wrapper> { using type = pod; }; \
} \
#define POINT_CLOUD_REGISTER_POINT_WRAPPER(wrapper, pod) \
static_assert(sizeof(wrapper) == sizeof(pod), \
"Point wrapper and POD types have different sizes."); \
namespace pcl { \
namespace traits { \
template<> struct POD<wrapper> { using type = pod; }; \
} \
}
/***/

Expand Down Expand Up @@ -248,8 +248,6 @@ namespace pcl
/***/

// Construct type traits given full sequence of (type, name, tag) triples
// BOOST_MPL_ASSERT_MSG(std::is_pod<name>::value,
// REGISTERED_POINT_TYPE_MUST_BE_PLAIN_OLD_DATA, (name));
#define POINT_CLOUD_REGISTER_POINT_STRUCT_I(name, seq) \
namespace pcl \
{ \
Expand Down