diff --git a/Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_triangulation_cell_base_3.h b/Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_triangulation_cell_base_3.h index cd0c29a99e5..bcca1bd0143 100644 --- a/Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_triangulation_cell_base_3.h +++ b/Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_triangulation_cell_base_3.h @@ -97,7 +97,7 @@ template class Cell_base_with_timestamp : public Cb { - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); public: using Has_timestamp = CGAL::Tag_true; diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_face_base_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_face_base_2.h index 46eec90e7e8..5601684ed22 100644 --- a/Mesh_2/include/CGAL/Delaunay_mesh_face_base_2.h +++ b/Mesh_2/include/CGAL/Delaunay_mesh_face_base_2.h @@ -78,7 +78,7 @@ public: void set_time_stamp(const std::size_t& ts) { time_stamp_ = ts; } - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); }; } // namespace CGAL diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_vertex_base_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_vertex_base_2.h index 159a5e77c88..0c62a20fb5c 100644 --- a/Mesh_2/include/CGAL/Delaunay_mesh_vertex_base_2.h +++ b/Mesh_2/include/CGAL/Delaunay_mesh_vertex_base_2.h @@ -67,7 +67,7 @@ public: void set_time_stamp(const std::size_t& ts) { time_stamp_ = ts; } - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); #endif // CGAL_MESH_2_DEBUG_REFINEMENT_POINTS }; diff --git a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h index ecd0236808a..e47d899faec 100644 --- a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h +++ b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h @@ -644,7 +644,7 @@ private: #ifdef CGAL_INTRUSIVE_LIST Cell_handle next_intrusive_ = {}, previous_intrusive_ = {}; #endif - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); std::array surface_center_index_table_ = {}; /// Stores visited facets (4 first bits) diff --git a/Mesh_3/include/CGAL/Mesh_cell_base_3.h b/Mesh_3/include/CGAL/Mesh_cell_base_3.h index b4552fb048a..ac5535f7090 100644 --- a/Mesh_3/include/CGAL/Mesh_cell_base_3.h +++ b/Mesh_3/include/CGAL/Mesh_cell_base_3.h @@ -273,7 +273,7 @@ private: #ifdef CGAL_INTRUSIVE_LIST Cell_handle next_intrusive_, previous_intrusive_; #endif - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); }; // end class Mesh_cell_base_3 diff --git a/Mesh_3/include/CGAL/Mesh_polyhedron_3.h b/Mesh_3/include/CGAL/Mesh_polyhedron_3.h index e6e96d03f03..04b6d247da1 100644 --- a/Mesh_3/include/CGAL/Mesh_polyhedron_3.h +++ b/Mesh_3/include/CGAL/Mesh_polyhedron_3.h @@ -41,10 +41,9 @@ private: typedef CGAL::HalfedgeDS_vertex_base Pdv_base; Set_of_indices indices; - std::size_t time_stamp_ = std::size_t(-1); - + std::size_t time_stamp_ = std::size_t(-2); public: - int nb_of_feature_edges; + int nb_of_feature_edges = 0; bool is_corner() const { return nb_of_feature_edges > 2; @@ -85,8 +84,8 @@ public: return indices; } - Mesh_polyhedron_vertex() : Pdv_base(), nb_of_feature_edges(0) {} - Mesh_polyhedron_vertex(const Point& p) : Pdv_base(p), nb_of_feature_edges(0) {} + Mesh_polyhedron_vertex() = default; + Mesh_polyhedron_vertex(const Point& p) : Pdv_base(p) {} }; template @@ -95,7 +94,7 @@ public CGAL::HalfedgeDS_halfedge_base { private: bool feature_edge; - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); public: @@ -143,7 +142,7 @@ public CGAL::HalfedgeDS_face_base { private: Patch_id_ patch_id_; - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); public: diff --git a/Mesh_3/include/CGAL/Mesh_vertex_base_3.h b/Mesh_3/include/CGAL/Mesh_vertex_base_3.h index e824f0ba694..db43424ec4f 100644 --- a/Mesh_3/include/CGAL/Mesh_vertex_base_3.h +++ b/Mesh_3/include/CGAL/Mesh_vertex_base_3.h @@ -250,7 +250,7 @@ private: Vertex_handle next_intrusive_; Vertex_handle previous_intrusive_; #endif - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); public: friend std::istream& operator>>(std::istream &is, Mesh_vertex_3& v) diff --git a/SMDS_3/include/CGAL/Compact_simplicial_mesh_cell_base_3.h b/SMDS_3/include/CGAL/Compact_simplicial_mesh_cell_base_3.h index 49ac4fcae23..9f26f6f3b29 100644 --- a/SMDS_3/include/CGAL/Compact_simplicial_mesh_cell_base_3.h +++ b/SMDS_3/include/CGAL/Compact_simplicial_mesh_cell_base_3.h @@ -47,18 +47,7 @@ public: public: // Constructors - Compact_simplicial_mesh_cell_3() {} - - Compact_simplicial_mesh_cell_3(const Compact_simplicial_mesh_cell_3& rhs) - : N(rhs.N) - , V(rhs.V) - , time_stamp_(rhs.time_stamp_) - , subdomain_index_(rhs.subdomain_index_) - { - for(int i=0; i <4; i++){ - surface_index_table_[i] = rhs.surface_index_table_[i]; - } - } + Compact_simplicial_mesh_cell_3() = default; Compact_simplicial_mesh_cell_3(Vertex_handle v0, Vertex_handle v1, @@ -277,7 +266,7 @@ private: std::array N; std::array V; - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); // The index of the cell of the input complex that contains me Subdomain_index subdomain_index_ = {}; diff --git a/SMDS_3/include/CGAL/Simplicial_mesh_cell_base_3.h b/SMDS_3/include/CGAL/Simplicial_mesh_cell_base_3.h index 7affb29b535..a9a98b155ba 100644 --- a/SMDS_3/include/CGAL/Simplicial_mesh_cell_base_3.h +++ b/SMDS_3/include/CGAL/Simplicial_mesh_cell_base_3.h @@ -96,7 +96,7 @@ public: }; public: - Simplicial_mesh_cell_base_3() {} + Simplicial_mesh_cell_base_3() = default; Simplicial_mesh_cell_base_3(const Simplicial_mesh_cell_base_3& rhs) : Cb(static_cast(rhs)), @@ -189,7 +189,7 @@ private: /// Stores surface_index for each facet of the cell std::array surface_index_table_ = {}; - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); // The index of the cell of the input complex that contains me Subdomain_index subdomain_index_ = {}; diff --git a/SMDS_3/include/CGAL/Simplicial_mesh_vertex_base_3.h b/SMDS_3/include/CGAL/Simplicial_mesh_vertex_base_3.h index 6d86764fdca..1a15aaf09d7 100644 --- a/SMDS_3/include/CGAL/Simplicial_mesh_vertex_base_3.h +++ b/SMDS_3/include/CGAL/Simplicial_mesh_vertex_base_3.h @@ -217,7 +217,7 @@ private: // that contains me. Negative values are a marker for special vertices. short dimension_; bool cache_validity; - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); public: friend std::istream& operator>>(std::istream& is, diff --git a/STL_Extension/test/STL_Extension/test_Compact_container.cpp b/STL_Extension/test/STL_Extension/test_Compact_container.cpp index c0235b6f018..8cb5d9726ec 100644 --- a/STL_Extension/test/STL_Extension/test_Compact_container.cpp +++ b/STL_Extension/test/STL_Extension/test_Compact_container.cpp @@ -18,7 +18,6 @@ template struct Node_1 : public CGAL::Compact_container_base { - Node_1() {} bool operator==(const Node_1 &) const { return true; } bool operator!=(const Node_1 &) const { return false; } bool operator< (const Node_1 &) const { return false; } @@ -49,7 +48,7 @@ struct Node_1 } ///@} int m_erase_counter; - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); }; class Node_2 diff --git a/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp b/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp index b4531b35c5c..e919369cabf 100644 --- a/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp +++ b/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp @@ -32,7 +32,6 @@ int main() struct Node_1 : public CGAL::Compact_container_base { - Node_1() {} bool operator==(const Node_1 &) const { return true; } bool operator!=(const Node_1 &) const { return false; } bool operator< (const Node_1 &) const { return false; } @@ -45,7 +44,7 @@ struct Node_1 void set_time_stamp(const std::size_t& ts) { time_stamp_ = ts; } - std::size_t time_stamp_ = std::size_t(-1); + std::size_t time_stamp_ = std::size_t(-2); }; class Node_2