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

do not use API that did not go into the standard

This commit is contained in:
Sébastien Loriot 2023-05-03 18:52:01 +02:00
parent 9a0bdb5d96
commit 56499e017d
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h
View File

@ -609,9 +609,7 @@ _merge_two_intervals(Edge_const_handle e1, bool is_leftmost1,
// This is the rightmost vertex in the current minimization diagram (out_d).
// The intersection points/curves that interest us are the ones in
// [v_leftmost, v].
// Without using make_optional we get a "maybe uninitialized" warning with gcc -Wall
std::optional<Vertex_const_handle> v_leftmost =
std::make_optional(false, Vertex_const_handle());
std::optional<Vertex_const_handle> v_leftmost;
if (is_leftmost1 == true) {
if (is_leftmost2 == false)

2
Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
View File

@ -1524,7 +1524,7 @@ change_ball_size(const Vertex_handle& v, const FT squared_size, const bool speci
Bare_point p = cp(c3t3_.triangulation().point(v)); // intentional copy
// Remove v from the set of corners
std::optional<Corner_index> corner_index = std::make_optional(false, Corner_index());
std::optional<Corner_index> corner_index;
if ( c3t3_.is_in_complex(v) )
{
corner_index = c3t3_.corner_index(v);

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

@ -2479,7 +2479,7 @@ change_ball_size(Vertex_handle& v, const FT squared_size, const bool special_bal
const Bare_point p = cp(c3t3_.triangulation().point(v)); // intentional copy
// Remove v from the set of corners
std::optional<Corner_index> corner_index = std::make_optional(false, Corner_index());
std::optional<Corner_index> corner_index;
if(c3t3_.is_in_complex(v))
{
corner_index = c3t3_.corner_index(v);

4
Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_and_constraints.cpp
View File

@ -167,8 +167,8 @@ void test_bool_op_no_copy(
typedef std::optional<Triangle_mesh*> OTM;
Triangle_mesh *ptr = nullptr;
const std::array<OTM,4> output =
reverse ? CGAL::make_array(OTM(&tm2), OTM(&tm1), std::make_optional(false,ptr), std::make_optional(false,ptr))
: CGAL::make_array(OTM(&tm1), OTM(&tm2), std::make_optional(false,ptr), std::make_optional(false,ptr));
reverse ? CGAL::make_array(OTM(&tm2), OTM(&tm1), std::optional<Triangle_mesh*>(), std::optional<Triangle_mesh*>())
: CGAL::make_array(OTM(&tm1), OTM(&tm2), std::optional<Triangle_mesh*>(), std::optional<Triangle_mesh*>());
PMP::corefine_and_compute_boolean_operations(tm1,
tm2,
output,

3
Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp
View File

@ -189,8 +189,7 @@ public Q_SLOTS:
void on_Sample_random_points_from_bbox() {
// calculate bbox of selected polyhedron items
std::optional<CGAL::Three::Scene_interface::Bbox> bbox
= std::make_optional(false, CGAL::Three::Scene_interface::Bbox());
std::optional<CGAL::Three::Scene_interface::Bbox> bbox;
// Workaround a bug in g++-4.8.3:
// https://stackoverflow.com/a/21755207/1728537
// Using std::make_optional to copy-initialize 'bbox' hides the

4
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
View File

@ -295,9 +295,7 @@ public:
constVPmap vpm = get(CGAL::vertex_point, *polyhedron());
std::optional<CGAL::Bbox_3> item_bbox
= std::make_optional(false, CGAL::Bbox_3());
std::optional<CGAL::Bbox_3> item_bbox;
for(Selection_set_vertex::const_iterator v_it = selected_vertices.begin();
v_it != selected_vertices.end(); ++v_it) {