Fixes (for clang, but other compilers should complain the same way):

#include <CGAL/Handle_for.h>

  prefix get with CGAL::
This commit is contained in:
Laurent Rineau 2010-09-22 16:05:05 +00:00
parent 0f8ab08585
commit 2b800fe1bd
2 changed files with 13 additions and 11 deletions

View File

@ -25,6 +25,7 @@
#define CGAL_HOMOGENEOUS_DIRECTION_2_H #define CGAL_HOMOGENEOUS_DIRECTION_2_H
#include <CGAL/array.h> #include <CGAL/array.h>
#include <CGAL/Handle_for.h>
namespace CGAL { namespace CGAL {
@ -74,12 +75,12 @@ public:
Vector_2 to_vector() const; Vector_2 to_vector() const;
const RT & x() const { return get(base)[0]; } const RT & x() const { return CGAL::get(base)[0]; }
const RT & y() const { return get(base)[1]; } const RT & y() const { return CGAL::get(base)[1]; }
const RT & delta(int i) const; const RT & delta(int i) const;
const RT & dx() const { return get(base)[0]; } const RT & dx() const { return CGAL::get(base)[0]; }
const RT & dy() const { return get(base)[1]; } const RT & dy() const { return CGAL::get(base)[1]; }
}; };

View File

@ -28,6 +28,7 @@
#include <CGAL/Origin.h> #include <CGAL/Origin.h>
#include <CGAL/array.h> #include <CGAL/array.h>
#include <CGAL/Kernel_d/Cartesian_const_iterator_d.h> #include <CGAL/Kernel_d/Cartesian_const_iterator_d.h>
#include <CGAL/Handle_for.h>
namespace CGAL { namespace CGAL {
@ -91,9 +92,9 @@ public:
bool operator==( const Null_vector&) const; bool operator==( const Null_vector&) const;
bool operator!=( const Null_vector& v) const; bool operator!=( const Null_vector& v) const;
const RT & hx() const { return get(base)[0]; }; const RT & hx() const { return CGAL::get(base)[0]; };
const RT & hy() const { return get(base)[1]; }; const RT & hy() const { return CGAL::get(base)[1]; };
const RT & hw() const { return get(base)[2]; }; const RT & hw() const { return CGAL::get(base)[2]; };
FT x() const { return FT(hx()) / FT(hw()); }; FT x() const { return FT(hx()) / FT(hw()); };
FT y() const { return FT(hy()) / FT(hw()); }; FT y() const { return FT(hy()) / FT(hw()); };
@ -104,13 +105,13 @@ public:
Cartesian_const_iterator cartesian_begin() const Cartesian_const_iterator cartesian_begin() const
{ {
return make_cartesian_const_iterator_begin(get(base).begin(), return make_cartesian_const_iterator_begin(CGAL::get(base).begin(),
boost::prior(get(base).end())); boost::prior(CGAL::get(base).end()));
} }
Cartesian_const_iterator cartesian_end() const Cartesian_const_iterator cartesian_end() const
{ {
return make_cartesian_const_iterator_end(boost::prior(get(base).end())); return make_cartesian_const_iterator_end(boost::prior(CGAL::get(base).end()));
} }
int dimension() const; int dimension() const;
@ -177,7 +178,7 @@ const typename VectorH2<R>::RT &
VectorH2<R>::homogeneous(int i) const VectorH2<R>::homogeneous(int i) const
{ {
CGAL_kernel_precondition( (i>=0) && (i<=2) ); CGAL_kernel_precondition( (i>=0) && (i<=2) );
return get(base)[i]; return CGAL::get(base)[i];
} }
template < class R > template < class R >