Package: src:rheolef
Followup-For: Bug #871811
The previous patch contained a syntax error. A fixed version is attached.
I just noticed there is one more CGAL-related build error, but I don't know how
to fix it. The excerpt from the log file is also attached.
[...]
geo_nearest.cc:476:1: required from here
/usr/include/CGAL/Triangulation_2.h:964:50: error: no match for call to
‘(rheolef::custom_cgal::my_cartesian2d_base<rheolef::custom_cgal::kernel_2d<double>,
CGAL::Cartesian<double> >::Construct_point_2 {aka
rheolef::custom_cgal::MyConstruct_point_2<rheolef::custom_cgal::kernel_2d<double>,
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
> >}) (const Point&)’
return geom_traits().construct_point_2_object()(p);
Joachim
-- System Information:
Debian Release: 9.1
APT prefers stable
APT policy: (800, 'stable'), (700, 'testing'), (500, 'unstable-debug'), (500,
'testing-debug'), (500, 'stable-debug'), (200, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- cgal_kernel.h.old 2017-09-23 10:42:03.890354799 +0200
+++ cgal_kernel.h 2017-09-23 11:16:50.588673451 +0200
@@ -247,7 +247,13 @@
std::ostream &
operator<<(std::ostream &os, const MySegmentC2<R> &s)
{
+#if CGAL_VERSION_NR >= 1041101000
+ switch(CGAL::get_mode(os)) {
+#elif CGAL_VERSION_NR >= 1041001000
+ switch(os.iword(CGAL::IO::get_static_mode())) {
+#else
switch(os.iword(CGAL::IO::mode)) {
+#endif
case CGAL::IO::ASCII :
return os << s.source() << ' ' << s.target();
case CGAL::IO::BINARY :
In file included from /usr/include/CGAL/Delaunay_triangulation_2.h:24:0,
from /usr/include/CGAL/Point_set_2.h:29,
from geo_nearest.cc:44:
/usr/include/CGAL/Triangulation_2.h: In instantiation of
‘CGAL::Triangulation_2<Gt, Tds>::Point_2 CGAL::Triangulation_2<Gt,
Tds>::construct_point(const Point&) const [with Gt =
CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>, true>;
Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; CGAL::Triangulation_2<Gt,
Tds>::Point_2 = CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
CGAL::Triangulation_2<Gt, Tds>::Point =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >]’:
/usr/include/CGAL/Triangulation_2.h:3451:62: required from ‘CGAL::Orientation
CGAL::Triangulation_2<Gt, Tds>::orientation(const Point&, const Point&, const
Point&) const [with Gt =
CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>, true>;
Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; CGAL::Orientation = CGAL::Sign;
CGAL::Triangulation_2<Gt, Tds>::Point =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >]’
/usr/include/CGAL/Triangulation_2.h:1206:37: required from
‘CGAL::Triangulation_2<Gt, Tds>::Vertex_handle CGAL::Triangulation_2<Gt,
Tds>::insert_outside_affine_hull(const Point&) [with Gt =
CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>, true>;
Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; CGAL::Triangulation_2<Gt,
Tds>::Vertex_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>,
CGAL::Triangulation_ds_vertex_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>; CGAL::Triangulation_2<Gt, Tds>::Point =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >]’
/usr/include/CGAL/Triangulation_2.h:1251:37: required from
‘CGAL::Triangulation_2<Gt, Tds>::Vertex_handle CGAL::Triangulation_2<Gt,
Tds>::insert(const Point&, CGAL::Triangulation_2<Gt, Tds>::Locate_type,
CGAL::Triangulation_2<Gt, Tds>::Face_handle, int) [with Gt =
CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>, true>;
Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; CGAL::Triangulation_2<Gt,
Tds>::Vertex_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>,
CGAL::Triangulation_ds_vertex_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>; CGAL::Triangulation_2<Gt, Tds>::Point =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
CGAL::Triangulation_2<Gt, Tds>::Face_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_ds_face_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>]’
/usr/include/CGAL/Delaunay_triangulation_2.h:877:52: required from
‘CGAL::Delaunay_triangulation_2<Gt, Tds>::Vertex_handle
CGAL::Delaunay_triangulation_2<Gt, Tds>::insert(const Point&,
CGAL::Delaunay_triangulation_2<Gt, Tds>::Locate_type,
CGAL::Delaunay_triangulation_2<Gt, Tds>::Face_handle, int) [with Gt =
CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>, true>;
Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; CGAL::Delaunay_triangulation_2<Gt,
Tds>::Vertex_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>,
CGAL::Triangulation_ds_vertex_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>; CGAL::Delaunay_triangulation_2<Gt, Tds>::Point =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
CGAL::Delaunay_triangulation_2<Gt, Tds>::Locate_type =
CGAL::Triangulation_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>,
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > >::Locate_type;
CGAL::Delaunay_triangulation_2<Gt, Tds>::Face_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_ds_face_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>]’
/usr/include/CGAL/Delaunay_triangulation_2.h:859:16: required from
‘CGAL::Delaunay_triangulation_2<Gt, Tds>::Vertex_handle
CGAL::Delaunay_triangulation_2<Gt, Tds>::insert(const Point&,
CGAL::Delaunay_triangulation_2<Gt, Tds>::Face_handle) [with Gt =
CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>, true>;
Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; CGAL::Delaunay_triangulation_2<Gt,
Tds>::Vertex_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>,
CGAL::Triangulation_ds_vertex_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>; CGAL::Delaunay_triangulation_2<Gt, Tds>::Point =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
CGAL::Delaunay_triangulation_2<Gt, Tds>::Face_handle =
CGAL::internal::CC_iterator<CGAL::Compact_container<CGAL::Triangulation_ds_face_base_2<CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> > >, CGAL::Default, CGAL::Default,
CGAL::Default>, false>]’
/usr/include/CGAL/Delaunay_triangulation_2.h:315:18: required from
‘std::ptrdiff_t CGAL::Delaunay_triangulation_2<Gt, Tds>::insert(InputIterator,
InputIterator, typename boost::enable_if<boost::is_convertible<typename
std::iterator_traits<_InputIterator>::value_type, typename Gt::Point_2>
>::type*) [with InputIterator =
std::_List_iterator<CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> > >;
Gt = CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>; Tds =
CGAL::Triangulation_data_structure_2<CGAL::Triangulation_vertex_base_2<CGAL::Filtered_kernel_adaptor<rheolef::custom_cgal::kernel_2d<double>,
true>, CGAL::Triangulation_ds_vertex_base_2<void> >,
CGAL::Triangulation_ds_face_base_2<void> >; std::ptrdiff_t = long int; typename
boost::enable_if<boost::is_convertible<typename
std::iterator_traits<_InputIterator>::value_type, typename Gt::Point_2> >::type
= void]’
geo_nearest.cc:200:3: required from ‘void rheolef::geo_nearest_rep<T, M,
2>::initialize(const rheolef::geo_base_rep<T, M>&) const [with T = double; M =
rheolef::sequential]’
geo_nearest.cc:120:87: required from ‘rheolef::geo_nearest_rep<T, M,
2>::geo_nearest_rep(const rheolef::geo_base_rep<T, M>&) [with T = double; M =
rheolef::sequential]’
geo_nearest.cc:321:19: required from ‘static
rheolef::geo_nearest_abstract_rep<T, M>* rheolef::geo_nearest<T,
M>::make_ptr(const rheolef::geo_base_rep<T, M>&) [with T = double; M =
rheolef::sequential]’
geo_nearest.cc:476:1: required from here
/usr/include/CGAL/Triangulation_2.h:964:50: error: no match for call to
‘(rheolef::custom_cgal::my_cartesian2d_base<rheolef::custom_cgal::kernel_2d<double>,
CGAL::Cartesian<double> >::Construct_point_2 {aka
rheolef::custom_cgal::MyConstruct_point_2<rheolef::custom_cgal::kernel_2d<double>,
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
> >}) (const Point&)’
return geom_traits().construct_point_2_object()(p);
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~
In file included from ../../include/rheolef/cgal_traits.h:24:0,
from geo_nearest.cc:43:
../../include/rheolef/cgal_kernel.h:318:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Rep
rheolef::custom_cgal::MyConstruct_point_2<K,
OldK>::operator()(CGAL::Return_base_tag, CGAL::Origin) const [with K =
rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Rep =
rheolef::point_basic<double>]
operator() (CGAL::Return_base_tag, CGAL::Origin o) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:318:3: note: candidate expects 2
arguments, 1 provided
../../include/rheolef/cgal_kernel.h:322:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Rep
rheolef::custom_cgal::MyConstruct_point_2<K,
OldK>::operator()(CGAL::Return_base_tag, const RT&, const RT&) const [with K =
rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Rep =
rheolef::point_basic<double>; rheolef::custom_cgal::MyConstruct_point_2<K,
OldK>::RT = double]
operator() (CGAL::Return_base_tag, const RT& x, const RT& y) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:322:3: note: candidate expects 3
arguments, 1 provided
../../include/rheolef/cgal_kernel.h:332:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::operator()(CGAL::Origin)
const [with K = rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2 =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >]
operator()(CGAL::Origin o) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:332:3: note: no known conversion for
argument 1 from ‘const Point {aka const
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >}’ to ‘CGAL::Origin’
../../include/rheolef/cgal_kernel.h:336:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::operator()(const RT&, const
RT&) const [with K = rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2 =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::RT = double]
operator()(const RT& x, const RT& y) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:336:3: note: candidate expects 2
arguments, 1 provided
../../include/rheolef/cgal_kernel.h:342:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::operator()(const Line_2&)
const [with K = rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2 =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Line_2 =
CGAL::Line_2<rheolef::custom_cgal::kernel_2d<double> >]
operator()(const Line_2& l) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:342:3: note: no known conversion for
argument 1 from ‘const Point {aka const
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >}’ to ‘const Line_2&
{aka const CGAL::Line_2<rheolef::custom_cgal::kernel_2d<double> >&}’
../../include/rheolef/cgal_kernel.h:350:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::operator()(const Line_2&,
int) const [with K = rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2 =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Line_2 =
CGAL::Line_2<rheolef::custom_cgal::kernel_2d<double> >]
operator()(const Line_2& l, int i) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:350:3: note: candidate expects 2
arguments, 1 provided
../../include/rheolef/cgal_kernel.h:358:3: note: candidate:
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::operator()(const RT&, const
RT&, const RT&) const [with K = rheolef::custom_cgal::kernel_2d<double>; OldK =
CGAL::Cartesian_base_ref_count<double, rheolef::custom_cgal::kernel_2d<double>
>; rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::Point_2 =
CGAL::Point_2<rheolef::custom_cgal::kernel_2d<double> >;
rheolef::custom_cgal::MyConstruct_point_2<K, OldK>::RT = double]
operator() (const RT& x, const RT& y, const RT& w) const
^~~~~~~~
../../include/rheolef/cgal_kernel.h:358:3: note: candidate expects 3
arguments, 1 provided
Makefile:860: recipe for target 'geo_nearest.lo' failed
make[4]: *** [geo_nearest.lo] Error 1
