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

use std tuple

This commit is contained in:
Sébastien Loriot 2025-02-05 16:54:18 +01:00
parent 1b9dca6e1f
commit 6f65025259
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
View File

@ -52,8 +52,7 @@
#ifndef CGAL_NO_ASSERTIONS #ifndef CGAL_NO_ASSERTIONS
# include <boost/math/special_functions/next.hpp> // for float_prior # include <boost/math/special_functions/next.hpp> // for float_prior
#endif #endif
#include <optional>
#include <boost/tuple/tuple.hpp>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
@ -62,10 +61,12 @@
#include <fstream> #include <fstream>
#include <iterator> #include <iterator>
#include <list> #include <list>
#include <optional>
#include <sstream> #include <sstream>
#include <set> #include <set>
#include <stack> #include <stack>
#include <string> #include <string>
#include <tuple>
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -511,11 +512,11 @@ private:
const Vertex_handle v2, const Vertex_handle v2,
const Curve_index& curve_index) const; const Curve_index& curve_index) const;
boost::tuple<Bare_point, Bare_point, Bare_point> get_positions(const Vertex_handle v1, std::tuple<Bare_point, Bare_point, Bare_point> get_positions(const Vertex_handle v1,
const Vertex_handle v2, const Vertex_handle v2,
const Vertex_handle v3, const Vertex_handle v3,
const Curve_index& curve_index, const Curve_index& curve_index,
const CGAL::Orientation orientation) const; const CGAL::Orientation orientation) const;
private: private:
C3T3& c3t3_; C3T3& c3t3_;
@ -953,9 +954,9 @@ get_positions_with_unknown_orientation(const Vertex_handle v1,
template <typename C3T3, typename MD, typename Sf> template <typename C3T3, typename MD, typename Sf>
boost::tuple<typename Protect_edges_sizing_field<C3T3, MD, Sf>::Bare_point, std::tuple<typename Protect_edges_sizing_field<C3T3, MD, Sf>::Bare_point,
typename Protect_edges_sizing_field<C3T3, MD, Sf>::Bare_point, typename Protect_edges_sizing_field<C3T3, MD, Sf>::Bare_point,
typename Protect_edges_sizing_field<C3T3, MD, Sf>::Bare_point> typename Protect_edges_sizing_field<C3T3, MD, Sf>::Bare_point>
Protect_edges_sizing_field<C3T3, MD, Sf>:: Protect_edges_sizing_field<C3T3, MD, Sf>::
get_positions(const Vertex_handle v1, get_positions(const Vertex_handle v1,
const Vertex_handle v2, const Vertex_handle v2,
@ -969,7 +970,7 @@ get_positions(const Vertex_handle v1,
std::tie(p2_check, p3) = get_positions(v2, v3, curve_index, orientation); std::tie(p2_check, p3) = get_positions(v2, v3, curve_index, orientation);
CGAL_assertion(p2_check == p2); CGAL_assertion(p2_check == p2);
return boost::make_tuple(p1, p2, p3); return std::make_tuple(p1, p2, p3);
} }

14
Poisson_surface_reconstruction_3/include/CGAL/Poisson_surface_reconstruction_3/internal/Poisson_sphere_oracle_3.h
View File

@ -24,7 +24,7 @@
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
#include <CGAL/Origin.h> #include <CGAL/Origin.h>
#include <boost/tuple/tuple.hpp> #include <tuple>
namespace CGAL { namespace CGAL {
@ -102,7 +102,7 @@ namespace CGAL {
{ {
const Self& oracle; const Self& oracle;
boost::tuple<int, FT, FT> std::tuple<int, FT, FT>
intersection_line_sphere_lambda(const Surface_3& sphere, intersection_line_sphere_lambda(const Surface_3& sphere,
const Point& a, const Point& a,
const Point& b) const const Point& b) const
@ -154,18 +154,18 @@ namespace CGAL {
switch( CGAL::sign(deltaprime) ) switch( CGAL::sign(deltaprime) )
{ {
case ZERO: case ZERO:
return boost::make_tuple(1, ab_ac / ab2, 0); return std::make_tuple(1, ab_ac / ab2, 0);
case POSITIVE: case POSITIVE:
{ {
const FT sqrt_deltaprime = CGAL::sqrt(deltaprime); const FT sqrt_deltaprime = CGAL::sqrt(deltaprime);
return boost::make_tuple(2, return std::make_tuple(2,
(ab_ac - sqrt_deltaprime) / ab2, (ab_ac - sqrt_deltaprime) / ab2,
(ab_ac + sqrt_deltaprime) / ab2); (ab_ac + sqrt_deltaprime) / ab2);
} }
case NEGATIVE: case NEGATIVE:
break; break;
} }
return boost::make_tuple(0, 0, 0); return std::make_tuple(0, 0, 0);
} //end intersection_line_sphere_lambda } //end intersection_line_sphere_lambda
template <class Assert_on_lambda> template <class Assert_on_lambda>

14
Surface_mesher/include/CGAL/Surface_mesher/Sphere_oracle_3.h
View File

@ -27,7 +27,7 @@
#include <CGAL/number_utils.h> #include <CGAL/number_utils.h>
#include <CGAL/Origin.h> #include <CGAL/Origin.h>
#include <boost/tuple/tuple.hpp> #include <tuple>
namespace CGAL { namespace CGAL {
@ -96,7 +96,7 @@ namespace CGAL {
{ {
const Self& oracle; const Self& oracle;
boost::tuple<int, FT, FT> std::tuple<int, FT, FT>
intersection_line_sphere_lambda(const Surface_3& sphere, intersection_line_sphere_lambda(const Surface_3& sphere,
const Point& a, const Point& a,
const Point& b) const const Point& b) const
@ -148,18 +148,18 @@ namespace CGAL {
switch( CGAL::sign(deltaprime) ) switch( CGAL::sign(deltaprime) )
{ {
case ZERO: case ZERO:
return boost::make_tuple(1, ab_ac / ab2, 0); return std::make_tuple(1, ab_ac / ab2, 0);
case POSITIVE: case POSITIVE:
{ {
const FT sqrt_deltaprime = CGAL::sqrt(deltaprime); const FT sqrt_deltaprime = CGAL::sqrt(deltaprime);
return boost::make_tuple(2, return std::make_tuple(2,
(ab_ac - sqrt_deltaprime) / ab2, (ab_ac - sqrt_deltaprime) / ab2,
(ab_ac + sqrt_deltaprime) / ab2); (ab_ac + sqrt_deltaprime) / ab2);
} }
case NEGATIVE: case NEGATIVE:
break; break;
} }
return boost::make_tuple(0, 0, 0); return std::make_tuple(0, 0, 0);
} //end intersection_line_sphere_lambda } //end intersection_line_sphere_lambda
template <class Assert_on_lambda> template <class Assert_on_lambda>