-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b075fbc
commit 492b944
Showing
1 changed file
with
41 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
diff --git a/io/include/pcl/io/ply/ply_parser.h b/io/include/pcl/io/ply/ply_parser.h | ||
index 649d19a..45709a8 100644 | ||
--- a/io/include/pcl/io/ply/ply_parser.h | ||
+++ b/io/include/pcl/io/ply/ply_parser.h | ||
@@ -115,7 +115,7 @@ namespace pcl | ||
|
||
class scalar_property_definition_callbacks_type | ||
{ | ||
- private: | ||
+ public: | ||
template <typename T> | ||
struct callbacks_element | ||
{ | ||
@@ -123,7 +123,8 @@ namespace pcl | ||
typedef T scalar_type; | ||
typename scalar_property_definition_callback_type<scalar_type>::type callback; | ||
}; | ||
- | ||
+ | ||
+ private: | ||
typedef boost::mpl::inherit_linearly< | ||
scalar_types, | ||
boost::mpl::inherit< | ||
@@ -218,6 +219,7 @@ namespace pcl | ||
boost::mpl::_1,boost::mpl::transform<Sequence2, pair_with<boost::mpl::_2> > > > | ||
{}; | ||
|
||
+ public: | ||
template <typename T> | ||
struct callbacks_element | ||
{ | ||
@@ -225,7 +227,8 @@ namespace pcl | ||
typedef typename T::second scalar_type; | ||
typename list_property_definition_callback_type<size_type, scalar_type>::type callback; | ||
}; | ||
- | ||
+ | ||
+ private: | ||
typedef boost::mpl::inherit_linearly<sequence_product<size_types, scalar_types>::type, boost::mpl::inherit<boost::mpl::_1, callbacks_element<boost::mpl::_2> > >::type callbacks; | ||
callbacks callbacks_; | ||
|
492b944
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am assuming this is for #1968 ? When I build pcl I see the below error.
492b944
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this should fix #1968 (at least, it does for me).
I'll try building everything from scratch for x64-windows, but it'll take a few hours.