songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove cpp11/cpp0x

This commit is contained in:
Sébastien Loriot 2019-11-04 11:34:53 +01:00
parent 9a0bff4008
commit b9a079b530
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classification/include/CGAL/Classification/Feature/Color_channel.h
View File

@ -99,7 +99,7 @@ public:
/// \cond SKIP_IN_MANUAL
virtual float value (std::size_t pt_index)
{
cpp11::array<double, 3> c = get(color_map, *(input.begin()+pt_index)).to_hsv();
std::array<double, 3> c = get(color_map, *(input.begin()+pt_index)).to_hsv();
return float(c[std::size_t(m_channel)]);
}
/// \endcond

2
NewKernel_d/include/CGAL/NewKernel_d/Lazy_cartesian.h
View File

@ -30,7 +30,7 @@ struct Nth_iterator_element : private Store_kernel<K> {
typedef typename Get_type<K, typename iterator_tag_traits<T>::value_tag>::type result_type;
template<class U> result_type operator()(U&& u, int i) const {
typename Get_functor<K, Construct_ttag<T> >::type ci(this->kernel());
return *cpp0x::next(ci(std::forward<U>(u),Begin_tag()),i);
return *std::next(ci(std::forward<U>(u),Begin_tag()),i);
}
};
//typedef typename Functor<typename iterator_tag_traits<T>::nth_element>::type nth_elem;

2
Polygon/include/CGAL/Polygon_2.h
View File

@ -445,7 +445,7 @@ class Polygon_2 {
Point_2& vertex(std::size_t i)
{
CGAL_precondition( i < d_container.size() );
return *(cpp11::next(d_container.begin(), i));
return *(std::next(d_container.begin(), i));
}
/// Returns a reference to the `i`-th vertex.
Point_2& operator[](std::size_t i)

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h
View File

@ -1694,7 +1694,7 @@ public:
else
{
// we push-back the halfedge for the next round only if it was not the first
if (h != *cpp11::prev(hit))
if (h != *std::prev(hit))
--hit;
break;
}

8
Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp
View File

@ -296,7 +296,7 @@ void test()
ss.str(std::string());
ss << "OFF\n 7 4 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 3 5\n";
ss >> tm1;
CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1);
CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1);
PMP::clip(tm1, K::Plane_3(-1,0,0,2));
assert(vertices(tm1).size()==6);
CGAL::clear(tm1);
@ -305,7 +305,7 @@ void test()
ss << "OFF\n 9 7 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 -1 0\n1 -1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 8 7\n3 1 3 5\n3 1 6 4\n3 1 0 8\n";
ss >> tm1;
for (int i=0;i<3;++i)
CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1);
CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1);
PMP::clip(tm1, K::Plane_3(-1,0,0,2));
assert(vertices(tm1).size()==7);
CGAL::clear(tm1);
@ -314,7 +314,7 @@ void test()
ss << "OFF\n 9 7 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 -1 0\n1 -1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 8 7\n3 1 3 5\n3 1 6 4\n3 1 0 8\n";
ss >> tm1;
for (int i=0;i<3;++i)
CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1);
CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1);
PMP::clip(tm1, K::Plane_3(0,1,0,0));
assert(vertices(tm1).size()==3);
CGAL::clear(tm1);
@ -323,7 +323,7 @@ void test()
ss << "OFF\n 9 7 0\n 0 0 0\n2 0 0\n4 0 0\n4 1 0\n0 1 0\n3 1 0\n 1 1 0\n3 -1 0\n1 -1 0\n3 0 1 4\n3 1 2 3\n3 1 5 6\n3 1 8 7\n3 1 3 5\n3 1 6 4\n3 1 0 8\n";
ss >> tm1;
for (int i=0;i<3;++i)
CGAL::Euler::remove_face(halfedge(*CGAL::cpp11::prev(faces(tm1).end()),tm1),tm1);
CGAL::Euler::remove_face(halfedge(*std::prev(faces(tm1).end()),tm1),tm1);
PMP::clip(tm1, K::Plane_3(0,-1,0,0));
assert(vertices(tm1).size()==7);
CGAL::clear(tm1);

2
Polyhedron_IO/include/CGAL/IO/PLY_reader.h
View File

@ -266,7 +266,7 @@ namespace CGAL{
{
has_uv = true;
}
cpp11::tuple<unsigned int, unsigned int, float, float, float> new_hedge;
std::tuple<unsigned int, unsigned int, float, float, float> new_hedge;
for (std::size_t j = 0; j < element.number_of_items(); ++ j)
{
for (std::size_t k = 0; k < element.number_of_properties(); ++ k)

10
Stream_support/include/CGAL/IO/Color.h
View File

@ -48,7 +48,7 @@ class Color
{
private:
cpp11::array<unsigned char, 4> m_data;
std::array<unsigned char, 4> m_data;
public:
@ -159,21 +159,21 @@ public:
/*!
returns the array with rgba values.
*/
const cpp11::array<unsigned char, 4>& to_rgba() const { return m_data; }
const std::array<unsigned char, 4>& to_rgba() const { return m_data; }
/*!
returns the array with rgb values.
*/
const cpp11::array<unsigned char, 3>& to_rgb() const
const std::array<unsigned char, 3>& to_rgb() const
{
return reinterpret_cast<const cpp11::array<unsigned char, 3>&>(m_data);
return reinterpret_cast<const std::array<unsigned char, 3>&>(m_data);
}
/*!
computes the hsv (hue, saturation, value) values and returns an
array representing them as float values between 0 and 1.
*/
cpp11::array<double, 3> to_hsv() const
std::array<double, 3> to_hsv() const
{
double r = (double)(m_data[0]) / 255.;
double g = (double)(m_data[1]) / 255.;

2
Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
View File

@ -280,7 +280,7 @@ void Surface_sweep_2<Vis>::_handle_overlaps_in_right_curves()
Subcurve_iterator next_after = this->m_currentEvent->get_curve_after_on_right(it->first);
for (std::size_t i=0; i<nbc; ++i)
{
_intersect(it->second[i], *cpp11::prev(next_after), this->m_currentEvent);
_intersect(it->second[i], *std::prev(next_after), this->m_currentEvent);
CGAL_assertion(it->second.size()==nbc); // make sure the container was not updated
}
}