Merge remote-tracking branch 'origin/CGAL-Less_warnings-GF'

Fix various warnings.

Tested in CGAL-4.5-Ic-97. Approved by the Release Manager.
This commit is contained in:
Laurent Rineau 2014-07-16 17:48:56 +02:00
commit 495ed0b6ab
8 changed files with 23 additions and 14 deletions

View File

@ -614,6 +614,9 @@ class Test_is_square {
typedef typename Is_square::first_argument_type First_argument_type;
typedef typename Is_square::second_argument_type Second_argument_type;
typedef typename Is_square::result_type Result_type;
CGAL_USE_TYPE(First_argument_type);
CGAL_USE_TYPE(Second_argument_type);
CGAL_static_assertion(
( ::boost::is_same< AS , First_argument_type>::value));
CGAL_static_assertion(
@ -647,6 +650,8 @@ public:
void operator() (const Sqrt& sqrt) {
typedef typename Sqrt::argument_type Argument_type;
typedef typename Sqrt::result_type Result_type;
CGAL_USE_TYPE(Argument_type);
CGAL_USE_TYPE(Result_type);
CGAL_static_assertion(( ::boost::is_same< AS , Argument_type>::value));
CGAL_static_assertion(( ::boost::is_same< AS , Result_type>::value));
typedef Algebraic_structure_traits<AS> AST;
@ -670,6 +675,9 @@ public:
typedef typename Root::first_argument_type First_argument_type;
typedef typename Root::second_argument_type Second_argument_type;
typedef typename Root::result_type Result_type;
CGAL_USE_TYPE(First_argument_type);
CGAL_USE_TYPE(Second_argument_type);
CGAL_USE_TYPE(Result_type);
CGAL_static_assertion(
( ::boost::is_same<int, First_argument_type>::value));
CGAL_static_assertion(

View File

@ -165,6 +165,9 @@ namespace CGAL_MINIBALL_NAMESPACE {
for (int i=m-1; i>0; --i) {
gamma[i] = beta[i];
// the next for won't do anything fori=m-1
// which triggers a warning with g++-4.8
// but it makes no sense to add an if(i!=m-1)
for (int j=i+1; j<m; ++j)
gamma[i] -= gamma[j]*tau[i][j];
gamma0 -= gamma[i];

View File

@ -158,7 +158,7 @@ public:
operator SHalfedge_handle() const
{ SHalfedge_handle e; CGAL::assign(e,Ibase::operator*()); return e; }
operator SHalfloop_handle() const
{ SHalfloop_handle l; CGAL::assign(l,Ibase::operator*()); return l; }
{ SHalfloop_handle l=0; CGAL::assign(l,Ibase::operator*()); return l; }
operator Object_handle() const { return Ibase::operator*(); }
Object_handle& operator*() const { return Ibase::operator*(); }
@ -188,7 +188,7 @@ public:
{ SHalfedge_handle e; CGAL::assign(e,Ibase::operator*());
return SHalfedge_const_handle(e); }
operator SHalfloop_const_handle() const
{ SHalfloop_handle l; CGAL::assign(l,Ibase::operator*());
{ SHalfloop_handle l=0; CGAL::assign(l,Ibase::operator*());
return SHalfloop_const_handle(l); }
operator Object_handle() const { return Ibase::operator*(); }

View File

@ -1,7 +1,6 @@
#include <iostream>
#include <cassert>
#include <CGAL/basic.h>
#include <CGAL/Arithmetic_kernel.h>
#ifdef CGAL_HAS_DEFAULT_ARITHMETIC_KERNEL
@ -17,7 +16,6 @@ int main()
// Set wrong rounding mode to test modular arithmetic
CGAL::Protect_FPU_rounding<true> pfr(CGAL_FE_UPWARD);
typedef CGAL::Arithmetic_kernel AK;
{
// Enforce IEEE double precision and to nearest before

View File

@ -1,6 +1,6 @@
#include <CGAL/basic.h>
#include <CGAL/use.h>
#include <CGAL/Test/_test_algebraic_structure.h>
#include <CGAL/Test/_test_real_embeddable.h>
@ -19,13 +19,13 @@
#define CGAL_DEFINE_TYPES_FROM_AK(AK) \
typedef typename AK::Integer Integer; \
typedef typename AK::Rational Rational; \
typedef typename AK::Field_with_sqrt Field_with_sqrt; \
typedef typename AK::Field_with_sqrt Field_with_sqrt; CGAL_USE_TYPE(Field_with_sqrt); \
typedef CGAL::Polynomial<Integer> Poly_int1; \
typedef CGAL::Polynomial<Poly_int1> Poly_int2; \
typedef CGAL::Polynomial<Poly_int2> Poly_int3; \
typedef CGAL::Polynomial<Poly_int2> Poly_int3; CGAL_USE_TYPE(Poly_int3); \
typedef CGAL::Polynomial<Rational> Poly_rat1; \
typedef CGAL::Polynomial<Poly_rat1> Poly_rat2; \
typedef CGAL::Polynomial<Poly_rat2> Poly_rat3;
typedef CGAL::Polynomial<Poly_rat2> Poly_rat3; CGAL_USE_TYPE(Poly_rat3);
// TODO: copied from number_type_utils.h

View File

@ -574,8 +574,8 @@ public:
insert( InputIterator1 p_first, InputIterator1 p_last,
InputIterator2 q_first, InputIterator2 q_last)
{
int old_r = static_cast<int>(p_points.size());
int old_s = static_cast<int>(q_points.size());
CGAL_optimisation_precondition_code(int old_r = static_cast<int>(p_points.size()));
CGAL_optimisation_precondition_code(int old_s = static_cast<int>(q_points.size()));
p_points.insert( p_points.end(), p_first, p_last);
q_points.insert( q_points.end(), q_first, q_last);
set_dimension();
@ -590,7 +590,7 @@ public:
void
insert_p( InputIterator p_first, InputIterator p_last)
{
int old_r = static_cast<int>(p_points.size());
CGAL_optimisation_precondition_code(int old_r = static_cast<int>(p_points.size()));
p_points.insert( p_points.end(), p_first, p_last);
set_dimension();
CGAL_optimisation_precondition_msg
@ -603,7 +603,7 @@ public:
void
insert_q( InputIterator q_first, InputIterator q_last)
{
int old_s = static_cast<int>(q_points.size());
CGAL_optimisation_precondition_code( int old_s = static_cast<int>(q_points.size()));
q_points.insert( q_points.end(), q_first, q_last);
set_dimension();
CGAL_optimisation_precondition_msg

View File

@ -171,7 +171,7 @@ create_offset_polygons_2 ( FT const& aOffset, Skeleton const& aSs, K const& /*k*
template<class Skeleton>
Skeleton const& dereference ( boost::shared_ptr<Skeleton> const& ss )
{
CGAL_precondition(ss!= NULL);
CGAL_precondition(ss.get() != 0);
return *ss;
}

View File

@ -574,7 +574,7 @@ is_one_to_one_mapping(const Adaptor& mesh,
const Vector& ,
const Vector& )
{
Vector_3 first_triangle_normal;
Vector_3 first_triangle_normal = NULL_VECTOR; // initialize to avoid warning
for (Facet_const_iterator facetIt = mesh.mesh_facets_begin();
facetIt != mesh.mesh_facets_end();