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

Disable fundamental type conversions (other than potentially K1::RT / K1::FT)

This commit is contained in:
Mael Rouxel-Labbé 2021-11-16 16:38:49 +01:00
parent ad0378b648
commit caba3482a6
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Cartesian_kernel/include/CGAL/Cartesian_converter.h
View File

@ -126,16 +126,15 @@ public:
return c(a);
}
// This intentionally does not require that K1::FT is constructible from T, because otherwise
// the function `bool Enum_converter::operator()(bool)` might be called instead, with an implicit
// conversion from the fundamental type to bool, which is usually unintended.
template <typename T>
typename K2::FT
operator()(const T& t,
typename std::enable_if<std::is_fundamental<T>::value>::type* = nullptr,
typename std::enable_if<!std::is_same<T, typename K1::FT>::value>::type* = nullptr)
operator()(const T&,
typename std::enable_if<std::is_fundamental<T>::value>::type* = nullptr) const
{
return c(typename K1::FT(t));
// Disable fundamental types (other than K1::FT) to avoid unexpected results
// More details: https://github.com/CGAL/cgal/issues/4982
CGAL_static_assertion(!(std::is_fundamental<T>::value));
return typename K2::FT();
}
// drop the boost::detail::variant::void_ generated by the macros

26
Homogeneous_kernel/include/CGAL/Homogeneous_converter.h
View File

@ -86,31 +86,17 @@ public:
return fc(a);
}
template <typename T>
typename K2::RT
operator()(const T& t,
typename std::enable_if<std::is_fundamental<T>::value>::type* = nullptr,
typename std::enable_if<std::is_constructible<typename K1::RT, T>::value>::type* = nullptr,
typename std::enable_if<!std::is_same<T, typename K1::RT>::value>::type* = nullptr,
typename std::enable_if<!std::is_same<T, typename K1::FT>::value>::type* = nullptr)
{
return rc(typename K1::RT(t));
}
// This intentionally does not require that K1::FT is constructible from T, because otherwise
// the function `bool Enum_converter::operator()(bool)` might be called instead, with an implicit
// conversion from the fundamental type to bool, which is usually unintended.
template <typename T>
typename K2::FT
operator()(const T& t,
typename std::enable_if<std::is_fundamental<T>::value>::type* = nullptr,
typename std::enable_if<!std::is_constructible<typename K1::RT, T>::value>::type* = nullptr,
typename std::enable_if<!std::is_same<T, typename K1::FT>::value>::type* = nullptr)
operator()(const T&,
typename std::enable_if<std::is_fundamental<T>::value>::type* = nullptr)
{
return fc(typename K1::FT(t));
// Disable fundamental types (other than K1::FT) to avoid unexpected results
// More details: https://github.com/CGAL/cgal/issues/4982
CGAL_static_assertion(!(std::is_fundamental<T>::value));
return typename K2::FT();
}
typename K2::Point_2
operator()(const typename K1::Point_2 &a) const
{

11
Kernel_d/include/CGAL/Kernel_d/Cartesian_converter_d.h
View File

@ -99,6 +99,17 @@ public:
return c(a);
}
template <typename T>
typename K2::FT
operator()(const T&,
typename std::enable_if<std::is_fundamental<T>::value>::type* = nullptr) const
{
// Disable fundamental types (other than K1::FT) to avoid unexpected results
// More details: https://github.com/CGAL/cgal/issues/4982
CGAL_static_assertion(!(std::is_fundamental<T>::value));
return typename K2::FT();
}
std::vector<Object>
operator()(const std::vector<Object>& v) const
{