Skip to content

Commit

Permalink
Merge branch 'Polygon_repair-less_copies-GF' into Triangulation_2-con…
Browse files Browse the repository at this point in the history
…straints-GF
  • Loading branch information
afabri committed Apr 19, 2024
2 parents e902027 + 31018d0 commit 9ac1493
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Polygon/include/CGAL/General_polygon_with_holes_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class General_polygon_with_holes_2 {

typedef unsigned int Size;

General_polygon_with_holes_2() : m_pgn() {}
General_polygon_with_holes_2() = default;


explicit General_polygon_with_holes_2(const Polygon_2& pgn_boundary) :
Expand Down
2 changes: 1 addition & 1 deletion Polygon/include/CGAL/Multipolygon_with_holes_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Multipolygon_with_holes_2 {
using Size = unsigned int;

/*! %Default constructor. */
Multipolygon_with_holes_2() {}
Multipolygon_with_holes_2() = default;

/*! Constructor from polygons. */
template <typename PolygonsInputIterator>
Expand Down
12 changes: 2 additions & 10 deletions Polygon/include/CGAL/Polygon_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,8 @@ class Polygon_2 {
/// Creates an empty polygon.
Polygon_2(const Traits & p_traits) : traits(p_traits) {}

/// Copy constructor.
Polygon_2(const Polygon_2<Traits_P,Container_P>& polygon) = default;

/// Move constructor
Polygon_2(Polygon_2<Traits_P,Container_P>&& polygon) = default;
// Move constructor
// Polygon_2(Polygon_2<Traits_P,Container_P>&& polygon) = default;

/// Creates a polygon with vertices from the sequence
/// defined by the range \c [first,last).
Expand All @@ -176,11 +173,6 @@ class Polygon_2 {
: d_container(first,last), traits(p_traits)
{}

#ifndef DOXYGEN_RUNNING
Polygon_2& operator=(const Polygon_2&) = default;
Polygon_2& operator=(Polygon_2&& p) = default;
#endif

/// @}

/// \name Modifiers
Expand Down
10 changes: 4 additions & 6 deletions Polygon/include/CGAL/Polygon_with_holes_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ class Polygon_with_holes_2 :
typedef typename Base::Size Size;

/*! %Default constructor. */
Polygon_with_holes_2 () :
Base()
{}
Polygon_with_holes_2 () = default;

/*! Constructor from the base class. */
Polygon_with_holes_2 (const Base& base) :
Expand All @@ -63,7 +61,7 @@ class Polygon_with_holes_2 :
Base (pgn_boundary)
{}

/*! Move constructor */
/*! Cconstructor moving a polygon */
explicit Polygon_with_holes_2 (Polygon_2&& pgn_boundary) :
Base (std::move(pgn_boundary))
{}
Expand All @@ -76,7 +74,7 @@ class Polygon_with_holes_2 :
Base (pgn_boundary, h_begin, h_end)
{}

/*! Move constructor.
/*! Cconstructor moving a polygon.
* \note In order to move the hole polygons a
* `std::move_iterator` may be used.
*/
Expand All @@ -87,7 +85,7 @@ class Polygon_with_holes_2 :
Base (std::move(pgn_boundary), h_begin, h_end)
{}

/*! Obtain the bounding box of the polygon with holes */
/*! returns the bounding box of the polygon with holes */
Bbox_2 bbox() const { return this->outer_boundary().bbox(); }

};
Expand Down

0 comments on commit 9ac1493

Please sign in to comment.