diff --git a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h index 12dbcf57506..eed1ea84977 100644 --- a/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h +++ b/Algebraic_foundations/include/CGAL/Algebraic_structure_traits.h @@ -29,6 +29,7 @@ #include #include #include +#include namespace CGAL { @@ -263,6 +264,7 @@ class Algebraic_structure_traits_base< Type_, const Type& y) const { typedef Algebraic_structure_traits AST; typedef typename AST::Is_exact Is_exact; + CGAL_USE_TYPE(Is_exact); typename AST::Div actual_div; CGAL_precondition_msg( @@ -358,6 +360,7 @@ class Algebraic_structure_traits_base< Type_, Type& r ) const { typedef Coercion_traits< NT1, NT2 > CT; typedef typename CT::Type Type; + CGAL_USE_TYPE(Type); CGAL_static_assertion(( ::boost::is_same::value)); @@ -459,6 +462,7 @@ class Algebraic_structure_traits_base< Type_, Field_tag > const Type& y) const { typedef Algebraic_structure_traits AST; typedef typename AST::Is_exact Is_exact; + CGAL_USE_TYPE(Is_exact); CGAL_precondition_code( bool ie = Is_exact::value; ) CGAL_precondition_msg( !ie || (x / y) * y == x, "'x' must be divisible by 'y' in " diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h index 28584dddfec..7355fe287df 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include @@ -614,6 +616,7 @@ insert_non_intersecting_curve Traits_adaptor_2; typedef typename Arr::Vertex_const_handle Vertex_const_handle; typedef typename Arr::Halfedge_const_handle Halfedge_const_handle; + CGAL_USE_TYPE(Halfedge_const_handle); const Traits_adaptor_2 * geom_traits = static_cast (arr.geometry_traits()); diff --git a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h index b5a126d413f..45ac8b08c19 100644 --- a/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h +++ b/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/is_reflex_sedge.h @@ -23,6 +23,7 @@ #undef CGAL_NEF_DEBUG #define CGAL_NEF_DEBUG 239 #include +#include namespace CGAL { @@ -144,6 +145,7 @@ int is_reflex_sedge(typename SNC_structure::SHalfedge_handle se, result |= 2; typedef typename SNC_structure::Sphere_segment Sphere_segment; + CGAL_USE_TYPE(Sphere_segment); if(os1 == ON_POSITIVE_SIDE && se2->twin()->source()->point() == dir) CGAL_assertion(Sphere_segment(se2->source()->point(), se2->twin()->source()->point(), se2->circle()).is_long()); diff --git a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h index 50ea7f0ecd7..4996ded71d8 100644 --- a/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h +++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h @@ -41,7 +41,6 @@ ch_graham_andrew_scan( BidirectionalIterator first, OutputIterator result, const Traits& ch_traits) { - typedef typename Traits::Point_2 Point_2; typedef typename Traits::Left_turn_2 Left_turn; std::vector< BidirectionalIterator > S; @@ -100,6 +99,7 @@ ch_graham_andrew_scan( BidirectionalIterator first, || defined(NDEBUG) OutputIterator res(result); #else + typedef typename Traits::Point_2 Point_2; Tee_for_output_iterator res(result); #endif // no postconditions ... for ( ++stack_iter; stack_iter != S.end(); ++stack_iter) diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index 3ec85c0a4bc..138687d20d1 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -375,6 +375,7 @@ Protect_edges_sizing_field:: insert_point(const Bare_point& p, const Weight& w, int dim, const Index& index) { typedef typename Tr::size_type size_type; + CGAL_USE_TYPE(size_type); // Insert point CGAL_assertion_code(size_type nb_vertices_before = c3t3_.triangulation().number_of_vertices()); diff --git a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h index 07d0f8a4bf1..78f90166384 100644 --- a/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h +++ b/Polyhedron/include/CGAL/intersection_of_Polyhedra_3_refinement_visitor.h @@ -1393,13 +1393,9 @@ public: void new_input_polyhedron(Polyhedron& P) { - #ifndef NDEBUG - std::pair res = - #endif + CGAL_assertion_code((std::pair) res = ) polyhedron_to_map_node_to_polyhedron_vertex.insert(std::make_pair( &P,Node_to_polyhedron_vertex_map() )); - #ifndef NDEBUG CGAL_assertion(res.second == true); - #endif } //1) split_halfedges and retriangulate faces with no intersection point interior to the facet diff --git a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h index bd3e18822e4..cecf2ab0793 100644 --- a/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h +++ b/Surface_mesher/include/CGAL/Surface_mesher/Surface_mesher_edges_level.h @@ -30,6 +30,7 @@ #include // for CGAL::Circulator_from_container #include #include +#include namespace CGAL { namespace Surface_mesher { @@ -121,7 +122,6 @@ namespace Surface_mesher { tr.geom_traits().compute_squared_length_3_object(); typedef std::vector Edge_dual; - typedef typename Edge_dual::size_type size_type; Edge_dual edge_dual; edge_dual.reserve(12); @@ -145,6 +145,8 @@ namespace Surface_mesher { // incident cell. typename Tr::Cell_circulator begin = circ; + typedef typename Edge_dual::size_type size_type; + CGAL_USE_TYPE(size_type); CGAL_assertion_code(size_type number_of_finite_incident_cells = 0); CGAL_assertion_code(size_type number_of_infinite_incident_cells = 0);