Skip to content

Commit 7820bf7

Browse files
Move static asserts outside callable
1 parent a0f7d09 commit 7820bf7

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

filters/include/pcl/filters/filter.h

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,15 @@ namespace pcl
143143
inline void
144144
filter(const Executor& exec, PointCloud& output)
145145
{
146+
static_assert(pcl::is_invocable_v<
147+
decltype(&DerivedFilter::template applyFilter<Executor>),
148+
DerivedFilter&,
149+
Executor const&,
150+
PointCloud&>,
151+
"An executor overload for applyFilter doesn't exist.");
152+
146153
auto filterCloud = [exec, this](PointCloud& output) {
147-
static_assert(
148-
pcl::is_invocable_v<
149-
decltype(&DerivedFilter::template applyFilter<Executor>),
150-
DerivedFilter&,
151-
Executor const&,
152-
PointCloud&>,
153-
"An executor overload for applyFilter doesn't exist.");
154-
155-
static_cast<DerivedFilter&>(*this).applyFilter(exec, output);
154+
static_cast<DerivedFilter&>(*this).applyFilter(exec, output);
156155
};
157156

158157
filterImpl(filterCloud, output);

filters/include/pcl/filters/filter_indices.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,14 @@ namespace pcl
122122
void
123123
filter (const Executor &exec, Indices &indices)
124124
{
125+
static_assert(pcl::is_invocable_v<
126+
decltype(&DerivedFilter::template applyFilter<Executor>),
127+
DerivedFilter&,
128+
Executor const&,
129+
PointCloud&>,
130+
"An executor overload for applyFilter doesn't exist.");
125131

126132
auto filterCloud = [exec, this](Indices& indices) {
127-
static_assert(pcl::is_invocable_v<
128-
decltype(&DerivedFilter::template applyFilter<Executor>),
129-
DerivedFilter&,
130-
Executor const&,
131-
PointCloud&>,
132-
"An executor overload for applyFilter doesn't exist.");
133-
134133
static_cast<DerivedFilter&>(*this).applyFilter(exec, indices);
135134
};
136135

filters/include/pcl/filters/impl/filter_indices.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ template<typename PointT, typename DerivedFilter>
8888
template <typename Executor> void
8989
pcl::FilterIndices<PointT, DerivedFilter>::applyFilter (const Executor &exec, PointCloud &output)
9090
{
91-
auto filterIndices = [this, exec](pcl::Indices& indices){
92-
static_assert(
93-
pcl::is_invocable_v<decltype(&DerivedFilter::template applyFilter<Executor>),
94-
DerivedFilter&,
95-
Executor const&,
96-
pcl::Indices&>,
97-
"An executor overload for applyFilter doesn't exist.");
98-
91+
static_assert(
92+
pcl::is_invocable_v<decltype(&DerivedFilter::template applyFilter<Executor>),
93+
DerivedFilter&,
94+
Executor const&,
95+
pcl::Indices&>,
96+
"An executor overload for applyFilter doesn't exist.");
97+
98+
auto filterIndices = [this, exec](pcl::Indices& indices) {
9999
static_cast<DerivedFilter&>(*this).applyFilter(exec, indices);
100100
};
101101

0 commit comments

Comments
 (0)