Merge branch 'Fix_warnings-GF'

Fixes warnings in various packages

Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
This commit is contained in:
Sébastien Loriot 2015-07-17 14:21:21 +02:00
commit 50595505c4
24 changed files with 119 additions and 84 deletions

View File

@ -756,7 +756,7 @@ public:
return oi;
}
dir1 == SMALLER ?
++i1 : (i1 != 0) ? --i1 : Polycurve_traits_2::INVALID_INDEX;
++i1 : (i1 != 0) ? --i1 : (std::size_t) Polycurve_traits_2::INVALID_INDEX;
left_res = EQUAL;
}
}
@ -779,7 +779,7 @@ public:
}
dir2 == SMALLER ?
++i2 : (i2 != 0) ? --i2 : Polycurve_traits_2::INVALID_INDEX;
++i2 : (i2 != 0) ? --i2 : (std::size_t) Polycurve_traits_2::INVALID_INDEX;
left_res = EQUAL;
}
}

View File

@ -3785,7 +3785,7 @@ namespace CGAL {
Combinatorial_map() : Base()
{}
Combinatorial_map(const Self & amap)
Combinatorial_map(const Self & amap) : Base()
{ Base::template copy<Self>(amap); }
template < class CMap >

View File

@ -25,7 +25,7 @@
#include <CGAL/Dimension.h>
#include <CGAL/Kernel_traits.h>
#include <CGAL/Cartesian_converter.h>
#include <CGAL/use.h>
/* Definition of functors used internally to copy combinatorial maps attributes
* (we need functors as attributes are stored in tuple, thus all the access
* must be done at compiling time).
@ -346,6 +346,7 @@ struct Default_converter_cmap_attributes
(const Map1& map1, Map2& map2, typename Map1::Dart_const_handle dh1,
typename Map2::Dart_handle dh2) const
{
CGAL_USE(dh2);
CGAL_assertion( map1.template attribute<i>(dh1)!=Map1::null_handle );
CGAL_assertion( map2.template attribute<i>(dh2)==Map2::null_handle );
return internal::Create_attribute_if_same_info_cmap
@ -363,6 +364,7 @@ struct Cast_converter_cmap_attributes
(const Map1& map1, Map2& map2, typename Map1::Dart_const_handle dh1,
typename Map2::Dart_handle dh2) const
{
CGAL_USE(dh2);
CGAL_assertion( map1.template attribute<i>(dh1)!=Map1::null_handle );
CGAL_assertion( map2.template attribute<i>(dh2)==Map2::null_handle );
typename Map2::template Attribute_handle<i>::type

View File

@ -23,6 +23,7 @@
#undef CGAL_NEF_DEBUG
#define CGAL_NEF_DEBUG 227
#include <CGAL/Nef_2/debug.h>
#include <CGAL/use.h>
namespace CGAL {
@ -75,7 +76,7 @@ class SM_walls : SM_decorator<SMap> {
}
SHalfedge_handle find_cap(SVertex_handle sv, Sphere_point sp, Sphere_circle c) {
CGAL_USE(sp);
CGAL_NEF_TRACEN( "find_cap " << sv->source()->point() << ":" << sv->point()
<< " , sp : " << sp );
/*

View File

@ -49,10 +49,10 @@ namespace CGAL {
template <class EP, class AP, class C2E, class C2A, bool Protection = true>
class Filtered_predicate
{
EP ep;
AP ap;
C2E c2e;
C2A c2a;
EP ep;
AP ap;
typedef typename AP::result_type Ares;
@ -74,12 +74,12 @@ public:
// the exact values systematically (in the ctor), rather than lazily.
template <class O>
Filtered_predicate(const O &o1)
: ep(c2e(o1)), ap(c2a(o1))
: c2e(), c2a(), ep(c2e(o1)), ap(c2a(o1))
{}
template <class O1, class O2>
Filtered_predicate(const O1 &o1, const O2 &o2)
: ep(c2e(o1), c2e(o2)), ap(c2a(o1), c2a(o2))
: c2e(), c2a(), ep(c2e(o1), c2e(o2)), ap(c2a(o1), c2a(o2))
{}
explicit Filtered_predicate(const EP& e, const AP& a)

View File

@ -26,6 +26,7 @@
#define CGAL_MATRIX___H
#include <CGAL/Kernel_d/Vector__.h>
#include <CGAL/use.h>
#include <new>
#include <cstddef> // for std::size_t, std::ptrdiff_t
@ -189,6 +190,7 @@ inline void deallocate_mat_space(vector_pointer*& vi, int d)
inline void check_dimensions(const Matrix_<NT_,AL_>& mat) const
{
CGAL_USE(mat);
CGAL_assertion_msg((dm_ == mat.dm_ && dn_ == mat.dn_),
"Matrix::check_dimensions: incompatible matrix dimensions.") ;
}

View File

@ -28,6 +28,7 @@
#include <CGAL/basic.h>
#include <CGAL/memory.h>
#include <CGAL/Kernel_d/debug.h>
#include <CGAL/use.h>
#include <cmath>
#include <memory>
@ -120,6 +121,7 @@ protected:
inline void
check_dimensions(const Vector_<NT_,AL_>& vec) const
{
CGAL_USE(vec);
CGAL_assertion_msg((d_ == vec.d_),
"Vector_::check_dimensions: object dimensions disagree.");
}

View File

@ -908,7 +908,7 @@ namespace CGAL {
* @param alcc the linear cell complex to copy.
* @post *this is valid.
*/
Linear_cell_complex(const Self & alcc)
Linear_cell_complex(const Self & alcc) : Base()
{ Base::template copy<Self>(alcc); }
template < class LCC2 >

View File

@ -280,10 +280,10 @@ class Meshing_debugging_layer : public CGAL::Qt_widget_layer
{
Q_OBJECT
Mesher* m;
bool point_on;
// bool point_on;
public:
Meshing_debugging_layer(QObject* parent = 0, const char* name = 0)
: Qt_widget_layer(parent, name), m(0), point_on(false)
: Qt_widget_layer(parent, name), m(0)/* , point_on(false) */
{
}
@ -1448,8 +1448,8 @@ private:
Seeds seeds;
Preferences* prefs;
QPopupMenu *pmCriteria;
int menu_id;
// QPopupMenu *pmCriteria;
// int menu_id;
CGAL::Qt_widget* widget;
CGAL::Qt_widget_get_point<K>* get_point;

View File

@ -32,6 +32,8 @@
#define CGAL_NEF_DEBUG 223
#include <CGAL/Nef_2/debug.h>
#include <CGAL/use.h>
namespace CGAL {
@ -169,7 +171,7 @@ class Gaussian_map :
}
public:
void visit(Vertex_const_handle v) { CGAL_NEF_TRACEN( "Vertices " << v->point() );}
void visit(Vertex_const_handle v) { CGAL_USE(v); CGAL_NEF_TRACEN( "Vertices " << v->point() );}
void visit(Halfedge_const_handle ) {}
void visit(SHalfedge_const_handle ) {}
void visit(SHalfloop_const_handle ) {}

View File

@ -32,6 +32,7 @@
#undef CGAL_NEF_DEBUG
#define CGAL_NEF_DEBUG 31
#include <CGAL/Nef_2/debug.h>
#include <CGAL/use.h>
namespace CGAL {
@ -135,8 +136,11 @@ Vertex_handle new_vertex(const Point& p) const
return p.vertex(); }
Halfedge_handle new_halfedge_pair_at_source(Vertex_handle v)
{ CGAL_NEF_TRACEN("new_edge "<<&*v<<" "<<edge_number+1);
return ++edge_number; }
{
CGAL_USE(v);
CGAL_NEF_TRACEN("new_edge "<<&*v<<" "<<edge_number+1);
return ++edge_number;
}
void supporting_segment(Halfedge_handle e, I it)
{ if ( From[it] != E() ) Support[e] = From[it]; }
@ -215,7 +219,9 @@ int compare_xy(const Point_2& p1, const Point_2& p2) const {
}
Point_2 intersection(const Segment_2& s1, const Segment_2& s2) const
{ CGAL_assertion(target(s1).vertex()==target(s2).vertex());
{
CGAL_USE(s2);
CGAL_assertion(target(s1).vertex()==target(s2).vertex());
return target(s1); }
bool left_turn(const Point_3& p1, const Point_3& p2, const Point_3& p3) const

View File

@ -40,6 +40,8 @@
#define CGAL_NEF_DEBUG 43
#include <CGAL/Nef_2/debug.h>
#include <CGAL/use.h>
namespace CGAL {
struct int_lt {
@ -245,10 +247,12 @@ public:
}
void visit(Vertex_handle h) {
CGAL_USE(h);
CGAL_NEF_TRACEN("visit v "<<h->point());
}
void visit(Halfedge_handle h) {
CGAL_USE(h);
CGAL_NEF_TRACEN("visit he "<< h->source()->point());
}

View File

@ -46,6 +46,8 @@
#include <LEDA/system/memory.h>
#endif
#include <CGAL/use.h>
namespace CGAL {
template <typename Decorator_, typename I>
@ -114,7 +116,11 @@ struct SMO_from_segs {
}
void assert_equal_marks(Vertex_handle v1, Vertex_handle v2) const
{ CGAL_assertion(v1->mark()==v2->mark()); }
{
CGAL_USE(v1);
CGAL_USE(v2);
CGAL_assertion(v1->mark()==v2->mark());
}
void discard_info(Vertex_handle v) const
{
@ -126,7 +132,11 @@ struct SMO_from_segs {
}
void assert_equal_marks(Halfedge_handle e1, Halfedge_handle e2) const
{ CGAL_assertion(e1->mark()==e2->mark()); }
{
CGAL_USE(e1);
CGAL_USE(e2);
CGAL_assertion(e1->mark()==e2->mark());
}
void discard_info(Halfedge_handle ) const {}
@ -281,7 +291,10 @@ Halfedge_handle halfedge_below(Vertex_handle v) const
{ return G.halfedge_below(v); }
void assert_equal_marks(Vertex_handle v1, Vertex_handle v2) const
{ CGAL_NEF_TRACEV(G.mark(v1,0));CGAL_NEF_TRACEV(G.mark(v1,1));
{
CGAL_USE(v1);
CGAL_USE(v2);
CGAL_NEF_TRACEV(G.mark(v1,0));CGAL_NEF_TRACEV(G.mark(v1,1));
CGAL_NEF_TRACEV(G.mark(v2,0));CGAL_NEF_TRACEV(G.mark(v2,1));
CGAL_assertion(G.mark(v1,0)==G.mark(v2,0)&&
G.mark(v1,1)==G.mark(v2,1)); }
@ -289,8 +302,12 @@ void discard_info(Vertex_handle v) const
{ G.discard_info(v); }
void assert_equal_marks(Halfedge_handle e1, Halfedge_handle e2) const
{ CGAL_assertion(G.mark(e1,0)==G.mark(e2,0) &&
G.mark(e1,1)==G.mark(e2,1)); }
{
CGAL_USE(e1);
CGAL_USE(e2);
CGAL_assertion(G.mark(e1,0)==G.mark(e2,0) &&
G.mark(e1,1)==G.mark(e2,1));
}
void discard_info(Halfedge_handle e) const
{ G.discard_info(e); }

View File

@ -49,17 +49,17 @@ int main(int, char**)
// missing construction from segments and random init
CGAL_TEST((N1*N1) == N1);
CGAL_TEST((N1*!N1) == EMPTY);
CGAL_TEST((N1*N1) == N1){}
CGAL_TEST((N1*!N1) == EMPTY){}
CGAL_NEF_TRACEV(N1);
CGAL_NEF_TRACEV(!N1);
CGAL_NEF_TRACEV(N1+!N1);
CGAL_TEST((N1+!N1) == SPHERE);
CGAL_TEST((N1^N2) == ((N1-N2)+(N2-N1))); // xor reformulation
CGAL_TEST((N1+!N1) == SPHERE){}
CGAL_TEST((N1^N2) == ((N1-N2)+(N2-N1))){} // xor reformulation
CGAL_NEF_TRACEV((N1*N2)); CGAL_NEF_TRACEV(!(N1*N2)); CGAL_NEF_TRACEV((!N1+!N2));
CGAL_NEF_TRACEV(!(N1*N2) ^ (!N1+!N2));
CGAL_TEST( (!(N1*N2)) == (!N1+!N2) ); // deMorgan
CGAL_TEST( (!(N1*N2)) == (!N1+!N2) ){} // deMorgan
#if 1
Nef_polyhedron N3 = N1.intersection(N2);
/* N3 is the two octants +++ and +-+ including the z-positive yz-halfplane
@ -68,24 +68,24 @@ int main(int, char**)
Nef_polyhedron N4(S,S+2,Nef_polyhedron::INCLUDED);
Nef_polyhedron N5(C,C+3,0.5);
CGAL_TEST(N3 < N1 && N3 < N2);
CGAL_TEST(N3 <= N1 && N3 <= N2);
CGAL_TEST(N1 > N3 && N2 > N3);
CGAL_TEST(N1 >= N3 && N2 >= N3);
CGAL_TEST(N3 < N1 && N3 < N2){}
CGAL_TEST(N3 <= N1 && N3 <= N2){}
CGAL_TEST(N1 > N3 && N2 > N3){}
CGAL_TEST(N1 >= N3 && N2 >= N3){}
SVertex_const_handle v;
SHalfedge_const_handle e;
SFace_const_handle f;
Object_handle h;
h = N3.locate(p1); // on y-axis
CGAL_TEST( CGAL::assign(v,h) );
CGAL_TEST( v->point() == p1 && !v->mark() );
CGAL_TEST( CGAL::assign(v,h) ){}
CGAL_TEST( v->point() == p1 && !v->mark() ){}
h = N3.locate(p2);
CGAL_TEST( CGAL::assign(e,h) );
CGAL_TEST( e->circle() == c3 && !e->mark() );
CGAL_TEST( CGAL::assign(e,h) ){}
CGAL_TEST( e->circle() == c3 && !e->mark() ){}
h = N3.locate(p3);
CGAL_TEST( CGAL::assign(f,h) );
CGAL_TEST( f->mark() );
CGAL_TEST( CGAL::assign(f,h) ){}
CGAL_TEST( f->mark() ){}
#endif
CGAL_TEST_END;
return 0;

View File

@ -25,29 +25,29 @@ int main()
SPoint p(0,0,1), q(1,1,0), r(1,-1,0), s(1,1,1);
SSegment s1(p,q), s2(p,r,false), s3(SPoint(0,-1,0),SPoint(-1,0,0));
SCircle c0, c1(p,q), c2(1,1,1), c3(Plane(1,1,1,0));
CGAL_TEST(p.x() == NT(0));
CGAL_TEST(p.y() == NT(0));
CGAL_TEST(p.z() == NT(1));
CGAL_TEST(p.antipode().antipode()==p);
CGAL_TEST(p.antipode()!=p);
CGAL_TEST(p.x() == NT(0)){}
CGAL_TEST(p.y() == NT(0)){}
CGAL_TEST(p.z() == NT(1)){}
CGAL_TEST(p.antipode().antipode()==p){}
CGAL_TEST(p.antipode()!=p){}
CGAL_TEST(c1.opposite().opposite()==c1);
CGAL_TEST(c1.has_on(p)&&c1.has_on(q));
CGAL_TEST(c3.plane()==Plane(1,1,1,0));
CGAL_TEST(c1.opposite().opposite()==c1){}
CGAL_TEST(c1.has_on(p)&&c1.has_on(q)){}
CGAL_TEST(c3.plane()==Plane(1,1,1,0)){}
c1.split_at(p);
c1.split_at_xy_plane();
CGAL_TEST(s1.is_short());
CGAL_TEST(s2.is_long());
CGAL_TEST(s1.source()==p);
CGAL_TEST(s1.target()==q);
CGAL_TEST(s1.sphere_circle()==c1);
CGAL_TEST(s1.opposite().opposite()==s1);
CGAL_TEST(s1.complement().complement()==s1);
CGAL_TEST(SSegment(p,p,c1).is_degenerate());
CGAL_TEST(SSegment(p,p.antipode(),c1).is_halfcircle());
CGAL_TEST(s1.has_on(p));
CGAL_TEST(SSegment(p,p.antipode(),c1).has_in_relative_interior(q));
CGAL_TEST(s1.is_short()){}
CGAL_TEST(s2.is_long()){}
CGAL_TEST(s1.source()==p){}
CGAL_TEST(s1.target()==q){}
CGAL_TEST(s1.sphere_circle()==c1){}
CGAL_TEST(s1.opposite().opposite()==s1){}
CGAL_TEST(s1.complement().complement()==s1){}
CGAL_TEST(SSegment(p,p,c1).is_degenerate()){}
CGAL_TEST(SSegment(p,p.antipode(),c1).is_halfcircle()){}
CGAL_TEST(s1.has_on(p)){}
CGAL_TEST(SSegment(p,p.antipode(),c1).has_in_relative_interior(q)){}
std::list<SSegment> L,Lp;
std::list<SSegment>::iterator it;

View File

@ -49,6 +49,8 @@
#include <iostream>
#include <cstdlib>
#include <CGAL/use.h>
namespace OpenNL {
@ -436,6 +438,7 @@ protected:
}
void check_state(State s) {
CGAL_USE(s);
CGAL_assertion(state_ == s) ;
}

View File

@ -1509,14 +1509,10 @@ public:
{
//get the corresponding halfedge with vertex corresponding to node_id_of_first
Halfedge_handle hedge=it_node_2_hedge->second;
#ifndef NDEBUG
Halfedge_handle start=hedge;
#endif
CGAL_assertion_code(Halfedge_handle start=hedge;)
while ( hedge->opposite()->vertex()!=it_node_2_hedge_two->second->vertex() ){
hedge=hedge->next()->opposite();
#ifndef NDEBUG
CGAL_assertion(hedge!=start);
#endif
}
std::pair<int,int> edge_pair(*it_id,node_id_of_first);
border_halfedges.insert( std::make_pair(hedge,edge_pair) );
@ -1572,9 +1568,7 @@ public:
//a map to identify the vertex in the polyhedron corresponding to an intersection point
Node_to_polyhedron_vertex_map& node_to_polyhedron_vertex=it_map->second;
#ifndef NDEBUG
Vertex_handle original_vertex=hedge->opposite()->vertex();
#endif
CGAL_assertion_code(Vertex_handle original_vertex=hedge->opposite()->vertex();)
//We need an edge incident to the source vertex of hedge. This is the first opposite edge created.
bool first=true; Halfedge_handle hedge_incident_to_src;
@ -1589,10 +1583,8 @@ public:
}
}
#ifndef NDEBUG
CGAL_assertion(hedge_incident_to_src->vertex()==original_vertex);
CGAL_assertion(hedge_incident_to_src->face()==hedge->opposite()->face());
#endif
//save original face and nodes for face of hedge->opposite (2)
if ( !hedge->opposite()->is_border() ){

View File

@ -41,8 +41,7 @@ int main(int argc, char*argv[])
{
std::vector<Point> tmp_points(k);
std::vector<Vector> tmp_normals(k);
int i=0;
for(int i=0; i<k; ++i){
for(std::size_t i=0; i<k; ++i){
tmp_points[i] = points[indices[i]];
tmp_normals[i] = normals[indices[i]];
}

View File

@ -143,8 +143,8 @@ substitute_xy(
typedef typename CGAL::Coercion_traits< CGAL::Polynomial< NT >, NTX > CT;
typedef typename CT::Type Coercion;
typedef typename CGAL::Coercion_traits< NT, NTX > CTi;
typedef typename CT::Type Coercion_i;
// typedef typename CGAL::Coercion_traits< NT, NTX > CTi;
// typedef typename CT::Type Coercion_i;
typedef CGAL::Polynomial_traits_d < Coercion > PT_dc;
std::vector< Coercion > replacements;

View File

@ -10,7 +10,7 @@
#include <CGAL/Random.h>
#include <cmath>
#include <CGAL/Test/_test_polynomial_traits_d.h>
#include <CGAL/use.h>
@ -21,7 +21,8 @@ void test_AK_1(){
CGAL::set_pretty_mode(std::cerr);
typedef typename AK::Integer Integer;
typedef typename AK::Rational Rational;
typedef typename AK::Rational Rational;
CGAL_USE_TYPE(Rational);
typedef CGAL::Polynomial<Integer> Poly;
@ -41,7 +42,7 @@ void test_AK_2(){
typedef typename AK::Integer Integer;
typedef typename AK::Rational Rational;
CGAL_USE_TYPE(Integer);
typedef CGAL::Polynomial<Rational> Poly;
typedef CGAL::Polynomial_traits_d<Poly> PT;
@ -82,7 +83,7 @@ void test_AK_5(){
typedef typename AK::Integer Integer;
typedef typename AK::Rational Rational;
CGAL_USE_TYPE(Integer);
typedef CGAL::Polynomial< CGAL::Sqrt_extension< Rational, Rational > > Poly;
@ -105,7 +106,8 @@ void test_AK_6(){
typedef typename AK::Integer Integer;
typedef typename AK::Rational Rational;
CGAL_USE_TYPE(Integer);
CGAL_USE_TYPE(Rational);
// Enforce IEEE double precision and to nearest before
// using modular arithmetic

View File

@ -40,12 +40,15 @@
#include <CGAL/LEDA_arithmetic_kernel.h>
#include <CGAL/Sqrt_extension.h>
#include <CGAL/Polynomial.h>
#include <CGAL/use.h>
#include <cassert>
template<class AT>
void test_modular_gcd_utils() {
CGAL_SNAP_ARITHMETIC_KERNEL_TYPEDEFS(AT);
CGAL_USE_TYPE(Rational);
CGAL_USE_TYPE(Field_with_sqrt);
CGAL::Random my_random(4711);
::CGAL::set_pretty_mode(std::cout);

View File

@ -638,10 +638,10 @@ void trivariate_polynomial_test() {
typedef typename AT::Integer Integer;
typedef typename AT::Rational Rational;
typedef CGAL::Sqrt_extension<Integer ,Integer> int_EXT_1;
typedef CGAL::Sqrt_extension<int_EXT_1,Integer> int_EXT_2;
typedef CGAL::Sqrt_extension<Rational ,Integer> rat_EXT_1;
typedef CGAL::Sqrt_extension<rat_EXT_1,Integer> rat_EXT_2;
// typedef CGAL::Sqrt_extension<Integer ,Integer> int_EXT_1;
// typedef CGAL::Sqrt_extension<int_EXT_1,Integer> int_EXT_2;
// typedef CGAL::Sqrt_extension<Rational ,Integer> rat_EXT_1;
// typedef CGAL::Sqrt_extension<rat_EXT_1,Integer> rat_EXT_2;
{
// testing trivariate polynomials with integer coefficients
typedef CGAL::Polynomial<Integer> int_POLY_1;

View File

@ -1024,9 +1024,9 @@ void test_AT(){
exact_tests<Integer>();
}{
typedef typename AT::Rational Rational;
typedef typename CGAL::Polynomial<Rational> Polynomial;
typedef CGAL::Euclidean_ring_tag Tag;
typedef CGAL::Tag_true Is_exact;
// typedef typename CGAL::Polynomial<Rational> Polynomial;
// typedef CGAL::Euclidean_ring_tag Tag;
// typedef CGAL::Tag_true Is_exact;
//can't use this test for Polynomials
//CGAL::test_algebraic_structure<Polynomial,Tag, Is_exact>();
basic_tests<Rational>();

View File

@ -616,7 +616,7 @@ private:
// Sets the pointer part and the type of the pointee.
static void set_type(pointer p_element, void * pointer, Type t)
{
CGAL_precondition(0 <= t && t < 4);
CGAL_precondition(0 <= t && (int) t < 4);
Traits::pointer(*p_element) =
(void *) ((clean_pointer((char *) pointer)) + (int) t);
}