mirror of https://github.com/CGAL/cgal
- GCC 3.1 fixes.
This commit is contained in:
Sylvain Pion
parent
c7efefbe31
commit
4e8d954902
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
// implementation: 2D Smallest Enclosing Circle
|
||||
// ============================================================================
|
||||
|
||||
#include <iterator>
|
||||
|
||||
CGAL_BEGIN_NAMESPACE
|
||||
|
||||
// Class implementation (continued)
|
||||
|
|
@ -38,7 +40,7 @@ operator << ( std::ostream& os,
|
|||
{
|
||||
CGAL_USING_NAMESPACE_STD
|
||||
|
||||
typedef Min_circle_2<Traits_>::Point Point;
|
||||
typedef typename Min_circle_2<Traits_>::Point Point;
|
||||
typedef ostream_iterator<Point> Os_it;
|
||||
|
||||
switch ( CGAL::get_mode( os)) {
|
||||
|
|
@ -95,7 +97,7 @@ operator >> ( std::istream& is, CGAL::Min_circle_2<Traits_>& min_circle)
|
|||
|
||||
case CGAL::IO::ASCII:
|
||||
case CGAL::IO::BINARY:
|
||||
typedef CGAL::Min_circle_2<Traits_>::Point Point;
|
||||
typedef typename CGAL::Min_circle_2<Traits_>::Point Point;
|
||||
typedef istream_iterator<Point> Is_it;
|
||||
min_circle.clear();
|
||||
min_circle.insert( Is_it( is), Is_it());
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ template < class K_ >
|
|||
std::istream&
|
||||
operator >> ( std::istream& is, CGAL::Optimisation_circle_2<K_>& c)
|
||||
{
|
||||
typedef CGAL::Optimisation_circle_2<K_>::Point Point;
|
||||
typedef CGAL::Optimisation_circle_2<K_>::Distance Distance;
|
||||
typedef typename CGAL::Optimisation_circle_2<K_>::Point Point;
|
||||
typedef typename CGAL::Optimisation_circle_2<K_>::Distance Distance;
|
||||
|
||||
switch ( CGAL::get_mode( is)) {
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@
|
|||
// implementation: dD Smallest Enclosing Sphere
|
||||
// ============================================================================
|
||||
|
||||
#include <iterator>
|
||||
|
||||
CGAL_BEGIN_NAMESPACE
|
||||
|
||||
// Class implementation (continued)
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ operator << ( std::ostream& os,
|
|||
{
|
||||
CGAL_USING_NAMESPACE_STD
|
||||
|
||||
typedef Min_sphere_d<Traits_>::Point Point;
|
||||
typedef typename Min_sphere_d<Traits_>::Point Point;
|
||||
typedef ostream_iterator<Point> Os_it;
|
||||
typedef typename Traits_::ET ET;
|
||||
typedef ostream_iterator<ET> Et_it;
|
||||
|
|
@ -632,7 +632,7 @@ operator >> ( std::istream& is, CGAL::Min_sphere_d<Traits_>& min_sphere)
|
|||
|
||||
case CGAL::IO::ASCII:
|
||||
case CGAL::IO::BINARY:
|
||||
typedef CGAL::Min_sphere_d<Traits_>::Point Point;
|
||||
typedef typename CGAL::Min_sphere_d<Traits_>::Point Point;
|
||||
typedef istream_iterator<Point> Is_it;
|
||||
min_sphere.set( Is_it( is), Is_it());
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -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(...)'
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
// includes
|
||||
#include <CGAL/Optimisation/basic.h>
|
||||
#include <vector>
|
||||
#include <iterator>
|
||||
#include <CGAL/IO/Verbose_ostream.h>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ transition( )
|
|||
|
||||
// numerator of current solution
|
||||
template < class Rep_ >
|
||||
QP_solver<Rep_>::ET
|
||||
typename QP_solver<Rep_>::ET
|
||||
QP_solver<Rep_>::
|
||||
solution_numerator( ) const
|
||||
{
|
||||
|
|
@ -411,7 +411,7 @@ solution_numerator( ) const
|
|||
|
||||
// variables of dual LP
|
||||
template < class Rep_ >
|
||||
QP_solver<Rep_>::ET
|
||||
typename QP_solver<Rep_>::ET
|
||||
QP_solver<Rep_>::
|
||||
dual_variable( int i) const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1656,7 +1656,7 @@ QP_solver<Rep_>::
|
|||
}
|
||||
|
||||
template < class Rep_ >
|
||||
const QP_solver<Rep_>::Pricing_strategy&
|
||||
const typename QP_solver<Rep_>::Pricing_strategy&
|
||||
QP_solver<Rep_>::
|
||||
pricing_strategy() const { return *strategyP; }
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue