From 4e8d954902064a7a27bc66a86ed239f2b13bb2c3 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Tue, 5 Feb 2002 10:23:42 +0000 Subject: [PATCH] - GCC 3.1 fixes. --- Packages/Min_circle_2/changes.txt | 3 +++ Packages/Min_circle_2/include/CGAL/Min_circle_2.C | 6 ++++-- Packages/Min_circle_2/include/CGAL/Optimisation_circle_2.C | 4 ++-- Packages/Min_sphere_d/changes.txt | 3 +++ Packages/Min_sphere_d/include/CGAL/Min_sphere_d.C | 2 ++ Packages/Min_sphere_d/include/CGAL/Optimisation_sphere_d.h | 4 ++-- Packages/Min_sphere_d_new/changes.txt | 3 +++ Packages/Min_sphere_d_new/include/CGAL/Min_sphere_d_new.h | 4 ++-- Packages/_QP_solver/changes.txt | 3 +++ Packages/_QP_solver/include/CGAL/_QP_solver/Basis_inverse.h | 1 + Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.C | 4 ++-- Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.h | 2 +- 12 files changed, 28 insertions(+), 11 deletions(-) diff --git a/Packages/Min_circle_2/changes.txt b/Packages/Min_circle_2/changes.txt index c5bba8d037c..42c1330f8ae 100644 --- a/Packages/Min_circle_2/changes.txt +++ b/Packages/Min_circle_2/changes.txt @@ -1,5 +1,8 @@ Changes done to the `Min_circle_2' package +Version 3.13 on 5-Feb-2002 +- GCC 3.1 fixes. + Version 3.12 on 31-Jul-2001 - Susan moved Optimisation_ref directory up one level diff --git a/Packages/Min_circle_2/include/CGAL/Min_circle_2.C b/Packages/Min_circle_2/include/CGAL/Min_circle_2.C index 3e1605ca6cf..5d812308158 100644 --- a/Packages/Min_circle_2/include/CGAL/Min_circle_2.C +++ b/Packages/Min_circle_2/include/CGAL/Min_circle_2.C @@ -25,6 +25,8 @@ // implementation: 2D Smallest Enclosing Circle // ============================================================================ +#include + CGAL_BEGIN_NAMESPACE // Class implementation (continued) @@ -38,7 +40,7 @@ operator << ( std::ostream& os, { CGAL_USING_NAMESPACE_STD - typedef Min_circle_2::Point Point; + typedef typename Min_circle_2::Point Point; typedef ostream_iterator Os_it; switch ( CGAL::get_mode( os)) { @@ -95,7 +97,7 @@ operator >> ( std::istream& is, CGAL::Min_circle_2& min_circle) case CGAL::IO::ASCII: case CGAL::IO::BINARY: - typedef CGAL::Min_circle_2::Point Point; + typedef typename CGAL::Min_circle_2::Point Point; typedef istream_iterator Is_it; min_circle.clear(); min_circle.insert( Is_it( is), Is_it()); diff --git a/Packages/Min_circle_2/include/CGAL/Optimisation_circle_2.C b/Packages/Min_circle_2/include/CGAL/Optimisation_circle_2.C index 798fb7edd10..ee64c0117ed 100644 --- a/Packages/Min_circle_2/include/CGAL/Optimisation_circle_2.C +++ b/Packages/Min_circle_2/include/CGAL/Optimisation_circle_2.C @@ -70,8 +70,8 @@ template < class K_ > std::istream& operator >> ( std::istream& is, CGAL::Optimisation_circle_2& c) { - typedef CGAL::Optimisation_circle_2::Point Point; - typedef CGAL::Optimisation_circle_2::Distance Distance; + typedef typename CGAL::Optimisation_circle_2::Point Point; + typedef typename CGAL::Optimisation_circle_2::Distance Distance; switch ( CGAL::get_mode( is)) { diff --git a/Packages/Min_sphere_d/changes.txt b/Packages/Min_sphere_d/changes.txt index 8a69096b1a5..17bd87d8e75 100644 --- a/Packages/Min_sphere_d/changes.txt +++ b/Packages/Min_sphere_d/changes.txt @@ -109,3 +109,6 @@ Changes from 2.25: Changes from 2.26: - Susan moved Optimisation_ref directory up one level + +Changes from 2.28: + - GCC 3.1 fixes. diff --git a/Packages/Min_sphere_d/include/CGAL/Min_sphere_d.C b/Packages/Min_sphere_d/include/CGAL/Min_sphere_d.C index 1c713f23b9f..f05df6ed3ad 100644 --- a/Packages/Min_sphere_d/include/CGAL/Min_sphere_d.C +++ b/Packages/Min_sphere_d/include/CGAL/Min_sphere_d.C @@ -25,6 +25,8 @@ // implementation: dD Smallest Enclosing Sphere // ============================================================================ +#include + CGAL_BEGIN_NAMESPACE // Class implementation (continued) diff --git a/Packages/Min_sphere_d/include/CGAL/Optimisation_sphere_d.h b/Packages/Min_sphere_d/include/CGAL/Optimisation_sphere_d.h index 3e6ef34d3c6..62b34ac5e13 100644 --- a/Packages/Min_sphere_d/include/CGAL/Optimisation_sphere_d.h +++ b/Packages/Min_sphere_d/include/CGAL/Optimisation_sphere_d.h @@ -108,11 +108,11 @@ class Optimisation_sphere_d; public: - Optimisation_sphere_d& get_sphere (Cartesian_tag t) + Optimisation_sphere_d& get_sphere (Cartesian_tag) {return *this;} const Optimisation_sphere_d& - get_sphere (Cartesian_tag t) const + get_sphere (Cartesian_tag) const {return *this;} Optimisation_sphere_d (const Traits& t = Traits()) diff --git a/Packages/Min_sphere_d_new/changes.txt b/Packages/Min_sphere_d_new/changes.txt index 6637bc88385..f1670a69153 100644 --- a/Packages/Min_sphere_d_new/changes.txt +++ b/Packages/Min_sphere_d_new/changes.txt @@ -1,5 +1,8 @@ Changes done to the `Min_sphere_d_new' package +Version 0.12.2 on 5-Feb-2002 +- GCC 3.1 fixes. + Version 0.12.1 on 16-Jul-2001 - renamed concept 'Optimisation_d_traits' to 'OptimisationDTraits' diff --git a/Packages/Min_sphere_d_new/include/CGAL/Min_sphere_d_new.h b/Packages/Min_sphere_d_new/include/CGAL/Min_sphere_d_new.h index 5cf8067c1ba..9d651fd4ef8 100644 --- a/Packages/Min_sphere_d_new/include/CGAL/Min_sphere_d_new.h +++ b/Packages/Min_sphere_d_new/include/CGAL/Min_sphere_d_new.h @@ -566,7 +566,7 @@ operator << ( std::ostream& os, { CGAL_USING_NAMESPACE_STD - typedef Min_sphere_d::Point Point; + typedef typename Min_sphere_d::Point Point; typedef ostream_iterator Os_it; typedef typename Traits_::ET ET; typedef ostream_iterator Et_it; @@ -632,7 +632,7 @@ operator >> ( std::istream& is, CGAL::Min_sphere_d& min_sphere) case CGAL::IO::ASCII: case CGAL::IO::BINARY: - typedef CGAL::Min_sphere_d::Point Point; + typedef typename CGAL::Min_sphere_d::Point Point; typedef istream_iterator Is_it; min_sphere.set( Is_it( is), Is_it()); break; diff --git a/Packages/_QP_solver/changes.txt b/Packages/_QP_solver/changes.txt index d98e3c3d494..554a3b95fa4 100644 --- a/Packages/_QP_solver/changes.txt +++ b/Packages/_QP_solver/changes.txt @@ -1,5 +1,8 @@ Changes done to the `_QP_solver' package +Version 0.9.4 on 5-Feb-2002 +- GCC 3.1 fixes. + Version 0.9.3 on 16-Jul-2001 - fixed warning of unused parameter in 'Basis_inverse::init(...)' diff --git a/Packages/_QP_solver/include/CGAL/_QP_solver/Basis_inverse.h b/Packages/_QP_solver/include/CGAL/_QP_solver/Basis_inverse.h index bd998292ac9..96426852cb6 100644 --- a/Packages/_QP_solver/include/CGAL/_QP_solver/Basis_inverse.h +++ b/Packages/_QP_solver/include/CGAL/_QP_solver/Basis_inverse.h @@ -30,6 +30,7 @@ // includes #include #include +#include #include diff --git a/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.C b/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.C index 0612073415a..d6014d3f4cf 100644 --- a/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.C +++ b/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.C @@ -365,7 +365,7 @@ transition( ) // numerator of current solution template < class Rep_ > -QP_solver::ET +typename QP_solver::ET QP_solver:: solution_numerator( ) const { @@ -411,7 +411,7 @@ solution_numerator( ) const // variables of dual LP template < class Rep_ > -QP_solver::ET +typename QP_solver::ET QP_solver:: dual_variable( int i) const { diff --git a/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.h b/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.h index 6427deefc3b..23a8d99790a 100644 --- a/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.h +++ b/Packages/_QP_solver/include/CGAL/_QP_solver/QP_solver.h @@ -1656,7 +1656,7 @@ QP_solver:: } template < class Rep_ > -const QP_solver::Pricing_strategy& +const typename QP_solver::Pricing_strategy& QP_solver:: pricing_strategy() const { return *strategyP; }