songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup code as indicated by compiler warnings

This commit is contained in:
Eric Berberich 2012-07-08 10:47:58 +00:00
parent bc4ca5b218
commit f87bbe2479
8 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_d_1.h
View File

@ -479,7 +479,6 @@ inline
convert_to_bfi(const internal::Algebraic_real_d_1< Coefficient_, Rational_, HandlePolicy, AlgebraicRealRep_d_1 >& x){ convert_to_bfi(const internal::Algebraic_real_d_1< Coefficient_, Rational_, HandlePolicy, AlgebraicRealRep_d_1 >& x){
typedef typename Get_arithmetic_kernel<Coefficient_>::Arithmetic_kernel AT; typedef typename Get_arithmetic_kernel<Coefficient_>::Arithmetic_kernel AT;
typedef typename AT::Bigfloat_interval BFI; typedef typename AT::Bigfloat_interval BFI;
typedef internal::Algebraic_real_d_1< Coefficient_, Rational_, HandlePolicy, AlgebraicRealRep_d_1 > ALG;
if (x.is_rational()) return convert_to_bfi(x.rational()); if (x.is_rational()) return convert_to_bfi(x.rational());

8
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Curve_pair_analysis_2.h
View File

@ -796,8 +796,6 @@ private:
CGAL_precondition(x.is_rational()); CGAL_precondition(x.is_rational());
Bound r = x.rational(); Bound r = x.rational();
typedef typename CGAL::Fraction_traits<Poly_coer_1> FT;
int k = degree_of_local_gcd(event_indices(i).fg,x); int k = degree_of_local_gcd(event_indices(i).fg,x);
Polynomial_2 sres = subresultants(k); Polynomial_2 sres = subresultants(k);
@ -1957,7 +1955,7 @@ create_slice_from_slice_info(size_type id,
switch(it->first) { switch(it->first) {
case(CGAL::internal::FIRST_CURVE): { case(CGAL::internal::FIRST_CURVE): {
if(event_flag) { if(event_flag) {
arc_container.push_back(std::make_pair(0,it->second)); arc_container.push_back(Arc_pair(0,it->second));
} else { } else {
int_container.push_back(0); int_container.push_back(0);
} }
@ -1965,7 +1963,7 @@ create_slice_from_slice_info(size_type id,
} }
case(CGAL::internal::SECOND_CURVE): { case(CGAL::internal::SECOND_CURVE): {
if(event_flag) { if(event_flag) {
arc_container.push_back(std::make_pair(1,it->second)); arc_container.push_back(Arc_pair(1,it->second));
} else { } else {
int_container.push_back(1); int_container.push_back(1);
} }
@ -1973,7 +1971,7 @@ create_slice_from_slice_info(size_type id,
} }
case(CGAL::internal::INTERSECTION): { case(CGAL::internal::INTERSECTION): {
CGAL_assertion(event_flag); CGAL_assertion(event_flag);
arc_container.push_back(std::make_pair(2,it->second)); arc_container.push_back(Arc_pair(2,it->second));
break; break;
} }
case(CGAL::internal::CANDIDATE): { case(CGAL::internal::CANDIDATE): {

1
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h
View File

@ -265,7 +265,6 @@ private:
void intern_decompose( Polynomial P_, ::CGAL::Tag_true){ void intern_decompose( Polynomial P_, ::CGAL::Tag_true){
typename FT_poly::Decompose decompose; typename FT_poly::Decompose decompose;
typedef typename FT_poly::Numerator_type Numerator_poly; typedef typename FT_poly::Numerator_type Numerator_poly;
typedef typename Numerator_poly::NT Coeff;
typename FT_poly::Numerator_type NumP; typename FT_poly::Numerator_type NumP;
typename FT_poly::Denominator_type dummy; typename FT_poly::Denominator_type dummy;

6
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Xy_coordinate_2.h
View File

@ -268,8 +268,10 @@ public:
Algebraic_real_1 y() const { Algebraic_real_1 y() const {
typedef std::vector< Algebraic_real_1 > Roots; typedef std::vector< Algebraic_real_1 > Roots;
typedef typename Curve_analysis_2::Status_line_1 Key; // EBEB 2012-07-05 deactivated map for y-roots for not being used
typedef Roots Data; // typedef typename Curve_analysis_2::Status_line_1 Key;
// EBEB 2012-07-05 deactivated map for y-roots for not being used
// typedef Roots Data;
// EBEB 2012-07-05 deactivated map for y-roots for not being used // EBEB 2012-07-05 deactivated map for y-roots for not being used
// typedef std::map< Key, Data, CGAL::Handle_id_less_than< Key > > // typedef std::map< Key, Data, CGAL::Handle_id_less_than< Key > >
// Y_root_map; // Y_root_map;

10
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/algebraic_curve_kernel_2_tools.h
View File

@ -232,10 +232,6 @@ namespace for_zero_test_bivariate {
template<typename Poly_coer_1,typename Polynomial_1> template<typename Poly_coer_1,typename Polynomial_1>
void cast_back_utcf(const Poly_coer_1& p,Polynomial_1& q) { void cast_back_utcf(const Poly_coer_1& p,Polynomial_1& q) {
// We can assume that both template arguments are polynomial types // We can assume that both template arguments are polynomial types
typedef typename CGAL::Polynomial_traits_d<Poly_coer_1>::Coefficient_type
Coercion_type;
typedef typename CGAL::Polynomial_traits_d<Polynomial_1>::Coefficient_type
Coefficient;
typedef CGAL::Fraction_traits<Poly_coer_1> FT; typedef CGAL::Fraction_traits<Poly_coer_1> FT;
CGAL_static_assertion((::boost::is_same<typename FT::Is_fraction, CGAL_static_assertion((::boost::is_same<typename FT::Is_fraction,
CGAL::Tag_true>::value)); CGAL::Tag_true>::value));
@ -275,8 +271,8 @@ template<typename AlgebraicCurveKernel_2>
bool result; bool result;
typedef typename AlgebraicCurveKernel_2::Polynomial_1 Polynomial_1; typedef typename AlgebraicCurveKernel_2::Polynomial_1 Polynomial_1;
#if !CGAL_ACK_USE_NO_REDUCTION_MODULO_RESULTANT #if !CGAL_ACK_USE_NO_REDUCTION_MODULO_RESULTANT
typedef typename AlgebraicCurveKernel_2::Algebraic_real_1 Algebraic_real_1; //typedef typename AlgebraicCurveKernel_2::Algebraic_real_1 Algebraic_real_1;
typedef typename AlgebraicCurveKernel_2::Bound Bound; typedef typename AlgebraicCurveKernel_2::Bound Bound;
typedef typename AlgebraicCurveKernel_2::Coefficient Coefficient; typedef typename AlgebraicCurveKernel_2::Coefficient Coefficient;
typedef typename AlgebraicCurveKernel_2::Polynomial_2 Polynomial_2; typedef typename AlgebraicCurveKernel_2::Polynomial_2 Polynomial_2;
@ -285,8 +281,6 @@ template<typename AlgebraicCurveKernel_2>
typedef typename Coercion::Type Coercion_type; typedef typename Coercion::Type Coercion_type;
typedef typename CGAL::Polynomial_traits_d<Polynomial_2> typedef typename CGAL::Polynomial_traits_d<Polynomial_2>
::template Rebind<Coercion_type,1>::Other::Type Poly_coer_1; ::template Rebind<Coercion_type,1>::Other::Type Poly_coer_1;
typedef typename CGAL::Polynomial_traits_d<Polynomial_2>
::template Rebind<Coercion_type,2>::Other::Type Poly_coer_2;
typename Coercion::Cast cast; typename Coercion::Cast cast;

1
Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/refine_zero_against.h
View File

@ -99,7 +99,6 @@ int descartes(Polynomial& p, const Field& low,const Field& high){
*/ */
template <class Polynomial, class Field> template <class Polynomial, class Field>
bool refine_zero_against(Field& low, Field& high, Polynomial p, Polynomial q) { bool refine_zero_against(Field& low, Field& high, Polynomial p, Polynomial q) {
typedef typename Polynomial::NT COEFF;
typename Algebraic_structure_traits<Field>::Simplify simplify; typename Algebraic_structure_traits<Field>::Simplify simplify;
CGAL_precondition(low < high); CGAL_precondition(low < high);

4
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
View File

@ -3348,8 +3348,8 @@ std::istream& operator>> (
CGAL_precondition(CGAL::is_ascii(is)); CGAL_precondition(CGAL::is_ascii(is));
typedef CurvedKernelViaAnalysis_2 Curved_kernel_via_analysis_2; //typedef CurvedKernelViaAnalysis_2 Curved_kernel_via_analysis_2;
typedef Rep_ Rep; //typedef Rep_ Rep;
arc.read(is); arc.read(is);

4
Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
View File

@ -823,8 +823,8 @@ std::istream& operator>> (
CGAL_precondition(CGAL::is_ascii(is)); CGAL_precondition(CGAL::is_ascii(is));
typedef CurvedKernelViaAnalysis_2 Curved_kernel_via_analysis_2; //typedef CurvedKernelViaAnalysis_2 Curved_kernel_via_analysis_2;
typedef Rep_ Rep; //typedef Rep_ Rep;
pt.read(is); pt.read(is);