Laurent Rineau
3e4fcd8d90
That is a follow-up to the following commit:
> commit 6b51b12ab5
> Author: Laurent Rineau <laurent.rineau@cgal.org>
> Date: Fri Oct 4 16:42:13 2013 +0200
>
> Fix the case when FT is mpq_class
>
> If x and w are mpq_class objects, then the type of x/w is not mpq_class,
> but only a proxy type that is implicitly convertible to
> mpq_class. With the type deduction, CGAL::make_array(x/w, y/w,
> z/w) will not create an array<mpq_class> but an array of the proxy type.
>
> That creates the following compilation error, in a ternary operator:
>
> - with clang:
> include/CGAL/Cartesian/Vector_3.h:78:25: error: incompatible operand types ('array<__gmp_expr<[...], struct __gmp_binary_expr<class __gmp_expr<mpq_t, mpq_t>, class __gmp_expr<mpq_t, mpq_t>, struct __gmp_binary_divides>>, [...]>' and 'array<__gmp_expr<[...], __mpq_struct [1]>, [...]>')
> : base( w != FT_(1) ? CGAL::make_array(x/w, y/w, z/w)
> ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> - with g++:
> include/CGAL/Cartesian/Vector_3.h:78:25: error: no match for ternary 'operator?:' (operand types are 'bool', 'std::array<__gmp_expr<__mpq_struct [1], __gmp_binary_expr<__gmp_expr<__mpq_struct [1], __mpq_struct [1]>, __gmp_expr<__mpq_struct [1], __mpq_struct [1]>, __gmp_binary_divides> >, 3ul>', and 'std::array<__gmp_expr<__mpq_struct [1], __mpq_struct [1]>, 3ul>')
> : base( w != FT_(1) ? CGAL::make_array(x/w, y/w, z/w)
> ^
>
> The fix is to specify the template argument of CGAL::make_array.
The first patch in 2013 was on `Vector_3`, but `Vector_2` also suffers
from the issue.
154 lines
3.3 KiB
C++
154 lines
3.3 KiB
C++
// Copyright (c) 2000
|
|
// Utrecht University (The Netherlands),
|
|
// ETH Zurich (Switzerland),
|
|
// INRIA Sophia-Antipolis (France),
|
|
// Max-Planck-Institute Saarbruecken (Germany),
|
|
// and Tel-Aviv University (Israel). All rights reserved.
|
|
//
|
|
// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public License as
|
|
// published by the Free Software Foundation; either version 3 of the License,
|
|
// or (at your option) any later version.
|
|
//
|
|
// Licensees holding a valid commercial license may use this file in
|
|
// accordance with the commercial license agreement provided with the software.
|
|
//
|
|
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
//
|
|
// $URL$
|
|
// $Id$
|
|
//
|
|
//
|
|
// Author(s) : Andreas Fabri, Herve Bronnimann
|
|
|
|
#ifndef CGAL_CARTESIAN_VECTOR_2_H
|
|
#define CGAL_CARTESIAN_VECTOR_2_H
|
|
|
|
#include <CGAL/Origin.h>
|
|
#include <CGAL/array.h>
|
|
#include <CGAL/constant.h>
|
|
#include <CGAL/Handle_for.h>
|
|
|
|
namespace CGAL {
|
|
|
|
template < class R_ >
|
|
class VectorC2
|
|
{
|
|
typedef typename R_::FT FT;
|
|
typedef typename R_::Point_2 Point_2;
|
|
typedef typename R_::Vector_2 Vector_2;
|
|
typedef typename R_::Segment_2 Segment_2;
|
|
typedef typename R_::Ray_2 Ray_2;
|
|
typedef typename R_::Line_2 Line_2;
|
|
typedef typename R_::Direction_2 Direction_2;
|
|
|
|
typedef cpp11::array<FT, 2> Rep;
|
|
typedef typename R_::template Handle<Rep>::type Base;
|
|
|
|
Base base;
|
|
|
|
public:
|
|
|
|
typedef typename Rep::const_iterator Cartesian_const_iterator;
|
|
|
|
typedef R_ R;
|
|
|
|
VectorC2() {}
|
|
|
|
VectorC2(const FT &x, const FT &y)
|
|
: base(CGAL::make_array(x, y)) {}
|
|
|
|
VectorC2(const FT &hx, const FT &hy, const FT &hw)
|
|
: base( hw != FT(1) ? CGAL::make_array<FT>(hx/hw, hy/hw)
|
|
: CGAL::make_array(hx, hy) ) {}
|
|
|
|
const FT & x() const
|
|
{
|
|
return CGAL::get_pointee_or_identity(base)[0];
|
|
}
|
|
|
|
const FT & y() const
|
|
{
|
|
return CGAL::get_pointee_or_identity(base)[1];
|
|
}
|
|
|
|
const FT & hx() const
|
|
{
|
|
return x();
|
|
}
|
|
|
|
const FT & hy() const
|
|
{
|
|
return y();
|
|
}
|
|
|
|
const FT& hw() const
|
|
{
|
|
return constant<FT, 1>();
|
|
}
|
|
|
|
Cartesian_const_iterator cartesian_begin() const
|
|
{
|
|
return CGAL::get_pointee_or_identity(base).begin();
|
|
}
|
|
|
|
Cartesian_const_iterator cartesian_end() const
|
|
{
|
|
return CGAL::get_pointee_or_identity(base).end();
|
|
}
|
|
|
|
};
|
|
|
|
template < class R >
|
|
CGAL_KERNEL_INLINE
|
|
bool
|
|
operator==(const VectorC2<R> &v, const VectorC2<R> &w)
|
|
{
|
|
return w.x() == v.x() && w.y() == v.y();
|
|
}
|
|
|
|
template < class R >
|
|
inline
|
|
bool
|
|
operator!=(const VectorC2<R> &v, const VectorC2<R> &w)
|
|
{
|
|
return !(v == w);
|
|
}
|
|
|
|
template < class R >
|
|
inline
|
|
bool
|
|
operator==(const VectorC2<R> &v, const Null_vector &)
|
|
{
|
|
return CGAL_NTS is_zero(v.x()) && CGAL_NTS is_zero(v.y());
|
|
}
|
|
|
|
template < class R >
|
|
inline
|
|
bool
|
|
operator==(const Null_vector &n, const VectorC2<R> &v)
|
|
{
|
|
return v == n;
|
|
}
|
|
|
|
template < class R >
|
|
inline
|
|
bool
|
|
operator!=(const VectorC2<R> &v, const Null_vector &n)
|
|
{
|
|
return !(v == n);
|
|
}
|
|
|
|
template < class R >
|
|
inline
|
|
bool
|
|
operator!=(const Null_vector &n, const VectorC2<R> &v)
|
|
{
|
|
return !(v == n);
|
|
}
|
|
|
|
} //namespace CGAL
|
|
|
|
#endif // CGAL_CARTESIAN_VECTOR_2_H
|