From 7657a5dda5b4ba091b1fe3964d8b1c534b66d09e Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 20 Jan 2016 11:57:51 +0100 Subject: [PATCH 01/16] Use CGAL_USE to avoid g++6.0 warning --- Kernel_23/include/CGAL/Kernel_checker.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Kernel_23/include/CGAL/Kernel_checker.h b/Kernel_23/include/CGAL/Kernel_checker.h index 5b1f2d00ffb..0f2ab86c1a0 100644 --- a/Kernel_23/include/CGAL/Kernel_checker.h +++ b/Kernel_23/include/CGAL/Kernel_checker.h @@ -34,6 +34,7 @@ // So the template parameter will be a comparator, not a converter. #include +#include #include #include @@ -52,28 +53,28 @@ template <> struct Pairify { typedef bool result_type; result_type operator()(const bool &t1, const bool &t2) const - { CGAL_kernel_assertion(t1 == t2); return t1; } + { CGAL_kernel_assertion(t1 == t2); CGAL_USE(t2); return t1; } }; template <> struct Pairify { typedef Sign result_type; result_type operator()(const Sign &t1, const Sign &t2) const - { CGAL_kernel_assertion(t1 == t2); return t1; } + { CGAL_kernel_assertion(t1 == t2); CGAL_USE(t2); return t1; } }; template <> struct Pairify { typedef Bounded_side result_type; result_type operator()(const Bounded_side &t1, const Bounded_side &t2) const - { CGAL_kernel_assertion(t1 == t2); return t1; } + { CGAL_kernel_assertion(t1 == t2); CGAL_USE(t2); return t1; } }; template <> struct Pairify { typedef Angle result_type; result_type operator()(const Angle &t1, const Angle &t2) const - { CGAL_kernel_assertion(t1 == t2); return t1; } + { CGAL_kernel_assertion(t1 == t2); CGAL_USE(t2); return t1; } }; From b9fa4bf852c8e19aae7446f64e94128ae009a11f Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 20 Jan 2016 12:08:09 +0100 Subject: [PATCH 02/16] Use CGAL_USE in Circulator_adapters.h too --- .../include/CGAL/Circulator/Circulator_adapters.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Circulator/include/CGAL/Circulator/Circulator_adapters.h b/Circulator/include/CGAL/Circulator/Circulator_adapters.h index bb7c08b40e7..eae2fde61b6 100644 --- a/Circulator/include/CGAL/Circulator/Circulator_adapters.h +++ b/Circulator/include/CGAL/Circulator/Circulator_adapters.h @@ -26,6 +26,7 @@ #define CGAL_CIRCULATOR_IMPL_H 1 #include +#include namespace CGAL { @@ -68,6 +69,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -111,6 +113,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -158,6 +161,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -210,6 +214,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -269,6 +274,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -307,6 +313,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -344,6 +351,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -393,6 +401,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return this->_ptr == NULL; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -465,6 +474,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return _i >= _size; } bool operator!=( Nullptr_t p) const { return !(*this == p); } @@ -589,6 +599,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == NULL); + CGAL_USE(p); return _i >= _size; } bool operator!=( Nullptr_t p) const { return !(*this == p); } From 6e1a97858fbfee55489f6eaae3260e767adbea4a Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 20 Jan 2016 12:16:25 +0100 Subject: [PATCH 03/16] Use CGAL_assertion_code() to avoid warning --- NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h index 26c014068f8..a7b58a8f8a8 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h @@ -56,7 +56,7 @@ template struct Array_vector { struct Construct_vector { struct Dimension { // Initialize with NaN if possible? - Vector operator()(unsigned d) const { + Vector operator()(unsigned CGAL_assertion_code(d)) const { CGAL_assertion(d<=d_); return Vector(); } From b06cdea579b0c1066c09ef32f423d70790499523 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 20 Jan 2016 12:19:07 +0100 Subject: [PATCH 04/16] Use CGAL_USE in Visibility_2 too --- Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h index d27d21e2eaf..1e86cc862d2 100644 --- a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h +++ b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h @@ -28,6 +28,7 @@ #include #include #include +#include namespace CGAL { @@ -217,6 +218,7 @@ public: out_arr.clear(); needles.clear(); + CGAL_USE(face); CGAL_assertion(!face->is_unbounded()); From d37815ef98caf312bec8d7654f82cb1cc83b0ce4 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 20 Jan 2016 12:21:27 +0100 Subject: [PATCH 05/16] Use CGAL_USE in Voronoi_diagram_2 too --- Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h index 6c6ad79b70b..1af1e095e8a 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -603,6 +604,7 @@ public: Ccb_halfedge_circulator ccb_halfedges(const Face_handle& f, const Halfedge_handle& he) const { CGAL_precondition( he->face() == f ); + CGAL_USE(f); return Ccb_halfedge_circulator(*he); } @@ -614,7 +616,7 @@ public: Halfedge_around_vertex_circulator incident_halfedges(const Vertex_handle& v, const Halfedge_handle& he) const { - internal::use(v); + CGAL_USE(v); CGAL_precondition( he->target() == v ); return Halfedge_around_vertex_circulator(*he); } From 3ef9aea5eb6eb9009473fbf9cb458a3a8c3490ff Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 09:24:02 +0100 Subject: [PATCH 06/16] fix indentation as it is really misleading --- Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h index ec85adfd8f6..78dbee1e9b2 100644 --- a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h +++ b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h @@ -1810,7 +1810,7 @@ public: if(!valid) { if (verbose) std::cerr << "Integrity of opposite halfedge of " << *it << " corrupted." << std::endl; - break; + break; } valid = valid && (next(prev(*it)) == *it); From 4f33354ace8f8b4f0c4e36066e438a686f924fd5 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 09:24:15 +0100 Subject: [PATCH 07/16] Use CGAL_USE --- STL_Extension/include/CGAL/Circulator_identity.h | 1 + STL_Extension/include/CGAL/Circulator_on_node.h | 1 + 2 files changed, 2 insertions(+) diff --git a/STL_Extension/include/CGAL/Circulator_identity.h b/STL_Extension/include/CGAL/Circulator_identity.h index a9a044869c6..918732bf491 100644 --- a/STL_Extension/include/CGAL/Circulator_identity.h +++ b/STL_Extension/include/CGAL/Circulator_identity.h @@ -61,6 +61,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == 0); + CGAL_USE(p); return ( nt == 0); //###// } bool operator!=( Nullptr_t p) const { diff --git a/STL_Extension/include/CGAL/Circulator_on_node.h b/STL_Extension/include/CGAL/Circulator_on_node.h index f7558246157..4da45bc43a1 100644 --- a/STL_Extension/include/CGAL/Circulator_on_node.h +++ b/STL_Extension/include/CGAL/Circulator_on_node.h @@ -63,6 +63,7 @@ public: bool operator==( Nullptr_t p) const { CGAL_assertion( p == 0); + CGAL_USE(p); return ( nt == 0); } bool operator!=( Nullptr_t p) const { return !(*this == p); } From 3b519819b48cd61ef162dcb0147e075bf03c6301 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 09:33:45 +0100 Subject: [PATCH 08/16] Use assertion_code() --- NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h index a7b58a8f8a8..0ad9bb36d72 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/array.h @@ -91,7 +91,7 @@ template struct Array_vector { struct Iterator_and_last { template - Vector operator()(unsigned d,Iter const& f,Iter const& e,CGAL_FORWARDABLE(T) t) const { + Vector operator()(unsigned CGAL_assertion_code(d),Iter const& f,Iter const& e,CGAL_FORWARDABLE(T) t) const { CGAL_assertion(d==std::distance(f,e)+1); CGAL_assertion(d<=d_); //TODO: optimize for forward iterators From 7eede75933f8f6ec3e4a7e620870adef1a50aa1b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 09:34:15 +0100 Subject: [PATCH 09/16] replace if with ()?: --- Polynomial/include/CGAL/Polynomial/Polynomial_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h index dd46e7b576c..3a73f5a045b 100644 --- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h +++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h @@ -597,7 +597,7 @@ public: //! return \c -p if \c p.sign()<0 and \c p otherwise Polynomial abs() const - { if ( sign()<0 ) return -*this; return *this; } + { return ( sign()<0 )? -*this : *this; } //! return the gcd of all coefficients /*! The content is defined as 1 for the zero polynomial. */ From f7b99bbccd6c0d3a604546f12e5f589c37e3b25c Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 09:39:42 +0100 Subject: [PATCH 10/16] improve indentation in Range_tree_d.h --- SearchStructures/include/CGAL/Range_tree_d.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SearchStructures/include/CGAL/Range_tree_d.h b/SearchStructures/include/CGAL/Range_tree_d.h index ca85542d834..a7b731b2c4e 100644 --- a/SearchStructures/include/CGAL/Range_tree_d.h +++ b/SearchStructures/include/CGAL/Range_tree_d.h @@ -399,10 +399,10 @@ public: if (v!=0) delete_tree(v); - if (header!=0) - delete header; - if (sublayer_tree!=0) - delete sublayer_tree; + if (header!=0) + delete header; + if (sublayer_tree!=0) + delete sublayer_tree; } From 99b4e2f15032818fec3bd47842444fb336ac7868 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 10:22:20 +0100 Subject: [PATCH 11/16] more CGAL_USE and some reindentations --- .../Khachiyan_approximation_impl.h | 3 ++- Kernel_d/include/CGAL/Kernel_d/Sphere_d.h | 2 ++ Kernel_d/include/CGAL/Kernel_d/Tuple_d.h | 6 ++++-- Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h | 2 ++ Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h | 1 + Nef_2/include/CGAL/Nef_2/PM_point_locator.h | 3 ++- Nef_2/include/CGAL/Nef_polyhedron_2.h | 12 ++++++++++-- Nef_3/include/CGAL/Nef_polyhedron_3.h | 2 +- Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h | 3 ++- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h b/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h index 73a12f6c4a1..2a07ab98873 100644 --- a/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h +++ b/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h @@ -28,6 +28,7 @@ #include #include +#include #include namespace CGAL { @@ -366,7 +367,7 @@ namespace CGAL { CGAL_APPEL_ASSERT(!check_tag(Exact_flag()) || tau == eps/((1+eps)*d-1)); CGAL_APPEL_ASSERT(!check_tag(Exact_flag()) || excess(tco.cartesian_begin(*P[k])) == (1+eps)*d); - + CGAL_USE(tau); const FT mu = eps / ((d-1)*(1+eps)); const FT alpha = 1 + mu; const FT beta = mu / (1+eps); diff --git a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h index 5756fccee0e..c250afa8162 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Sphere_d.h @@ -28,6 +28,7 @@ #include #include #include +#include namespace CGAL { @@ -56,6 +57,7 @@ public: P(first,last), cp(0) { TUPLE_DIM_CHECK(P.begin(),P.end(),Sphere_d); CGAL_assertion(d+1==int(P.size())); + CGAL_USE(d); typename R::Orientation_d orientation_; orient = orientation_(P.begin(),P.end()); } diff --git a/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h b/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h index 6f07dbe1886..48d6451aa67 100644 --- a/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h +++ b/Kernel_d/include/CGAL/Kernel_d/Tuple_d.h @@ -224,11 +224,13 @@ void Tuple_d::print(std::ostream& os, const char* l) const case CGAL::IO::ASCII : os << size() << " "; for (i = 0; i < size(); ++i) - os << v[i] << " "; break; + os << v[i] << " "; + break; case CGAL::IO::BINARY : CGAL::write(os, size()); for (i = 0; i < size(); ++i) - CGAL::write(os, v[i]); break; + CGAL::write(os, v[i]); + break; default : os << l << "(" << size() << ", "; for (i = 0; i < size(); ++i) { diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h index 90a6808f053..3c82d134f6c 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h @@ -27,6 +27,7 @@ #include #include +#include #include #undef CGAL_KD_TRACE @@ -143,6 +144,7 @@ public: result_type operator()(Forward_iterator start, Forward_iterator end) const { CGAL_assertion(start!=end); + CGAL_USE(d); int d = start->dimension(); Matrix M(d); Vector b(d); diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h index 8d634d3d607..38c4a2e6a78 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsHd.h @@ -128,6 +128,7 @@ typedef typename R::LA LA; template Point_d operator()(Forward_iterator start, Forward_iterator end) const { CGAL_assertion(start!=end); + CGAL_USE(end); int d = start->dimension(); typename LA::Matrix M(d); typename LA::Vector b(d); diff --git a/Nef_2/include/CGAL/Nef_2/PM_point_locator.h b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h index 45b8710a0f7..92234dbaa00 100644 --- a/Nef_2/include/CGAL/Nef_2/PM_point_locator.h +++ b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h @@ -174,8 +174,9 @@ public: Direction d_res = direction(e_res); Halfedge_around_vertex_const_circulator el(e_res),ee(el); CGAL_For_all(el,ee) { - if ( K.strictly_ordered_ccw(d_res, direction(el), d) ) + if ( K.strictly_ordered_ccw(d_res, direction(el), d) ){ e_res = el; d_res = direction(e_res); + } } CGAL_NEF_TRACEN(" determined "< std::ostream& operator<<(std::ostream& os, const CGAL::Sphere_triangle& t) { for (int i=0; i<3; ++i) os << t.point(i); - for (int i=0; i<3; ++i) os << t.circle(i); return os; } + for (int i=0; i<3; ++i) os << t.circle(i); + return os; } template std::istream& operator>>(std::istream& is, From d0d9471e3c45ff5bf8ee5b1e79fcf1ff860e3384 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 10:23:19 +0100 Subject: [PATCH 12/16] one more reindentation --- Matrix_search/include/CGAL/sorted_matrix_search.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Matrix_search/include/CGAL/sorted_matrix_search.h b/Matrix_search/include/CGAL/sorted_matrix_search.h index af2dc014e07..1ac8585a4f4 100644 --- a/Matrix_search/include/CGAL/sorted_matrix_search.h +++ b/Matrix_search/include/CGAL/sorted_matrix_search.h @@ -397,7 +397,7 @@ sorted_matrix_search(InputIterator f, InputIterator l, Traits t) } // both upper_median and lower_median are infeasible - active_cells.erase( new_end, active_cells.end()); + active_cells.erase( new_end, active_cells.end()); } // for (;;) // there must be only one cell left: From c8d66590fcc55931ab6b55b5a81e4d528b3ac9e0 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 11:07:42 +0100 Subject: [PATCH 13/16] more CGAL_USE --- .../include/CGAL/Kinetic/Regular_triangulation_3.h | 4 ++++ Kinetic_data_structures/include/CGAL/Kinetic/Sort.h | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h index 900fb696321..5ffee239008 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h @@ -464,6 +464,7 @@ public: public: void audit_move(Event_key k, Point_key pk, Cell_handle h, int) const { + CGAL_USE(k); CGAL_assertion(kdel_.vertex_handle(pk) == Vertex_handle()); CGAL_assertion(redundant_points_.find(pk) != redundant_points_.end()); CGAL_assertion(redundant_points_.find(pk)->second == k); @@ -471,12 +472,15 @@ public: } void audit_push(Event_key k, Point_key pk, Cell_handle h) const { + CGAL_USE(k); CGAL_assertion(kdel_.vertex_handle(pk) == Vertex_handle()); CGAL_assertion(redundant_points_.find(pk) != redundant_points_.end()); CGAL_assertion(redundant_points_.find(pk)->second == k); audit_redundant(pk, h); } void audit_pop(Event_key k, Vertex_handle vh) const { + CGAL_USE(k); + CGAL_USE(vh); CGAL_assertion_code(if (vh->info() != k) std::cerr << vh->info() << std::endl << k << std::endl); CGAL_assertion(vh->info() == k); } diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h b/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h index 11940198b55..31341ddf752 100644 --- a/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h +++ b/Kinetic_data_structures/include/CGAL/Kinetic/Sort.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -453,15 +454,12 @@ public: if (s_.will_fail()) out << " next is " << s_.failure_time(); else out << " out of failures"; } - void audit(typename Sort::Event_key -#ifndef NDEBUG - tk -#endif -) const { + void audit(typename Sort::Event_key tk) const { //std::cout << "Auditing event "; //write(std::cout); //std::cout << std::endl; CGAL_assertion(left_object_->event() == tk); + CGAL_USE(tk); } Id left_object_; Solver s_; }; From 34af59ecd1d574571c239f03ac46e0a88e37c961 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 12:30:25 +0100 Subject: [PATCH 14/16] one more assertion_code() --- NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h b/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h index 370bbad7c72..9a0924501c9 100644 --- a/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h +++ b/NewKernel_d/include/CGAL/NewKernel_d/Vector/vector.h @@ -59,7 +59,7 @@ template struct Vector_vector { #if 0 struct Iterator_add_one { template - Vector operator()(int d,Iter const& f,Iter const& e) const { + Vector operator()(int CGAL_assertion_code(d),Iter const& f,Iter const& e) const { CGAL_assertion(d==std::distance(f,e)+1); Vector a; a.reserve(d+1); From 4e342a0f05808605cb296d54880d2719d1748e77 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 21 Jan 2016 17:54:11 +0100 Subject: [PATCH 15/16] forgot a } --- Nef_3/include/CGAL/Nef_polyhedron_3.h | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/Nef_3/include/CGAL/Nef_polyhedron_3.h b/Nef_3/include/CGAL/Nef_polyhedron_3.h index 55d8c2d9456..b6f5b2d79aa 100644 --- a/Nef_3/include/CGAL/Nef_polyhedron_3.h +++ b/Nef_3/include/CGAL/Nef_polyhedron_3.h @@ -193,12 +193,25 @@ class Nef_polyhedron_3 : public CGAL::Handle_for< Nef_polyhedron_3_rep Nef_rep; From d1ffbee57a435bdbc47d0d57fdd26ca1234c5e68 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 22 Jan 2016 08:08:13 +0100 Subject: [PATCH 16/16] a CGAL_USE too much --- Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h index 3c82d134f6c..12321c69166 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h @@ -144,7 +144,6 @@ public: result_type operator()(Forward_iterator start, Forward_iterator end) const { CGAL_assertion(start!=end); - CGAL_USE(d); int d = start->dimension(); Matrix M(d); Vector b(d);