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

fix narrowing

This commit is contained in:
Sébastien Loriot 2023-04-26 09:55:14 +02:00
parent c0ec1b96f5
commit 72624bb0f1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h
View File

@ -69,7 +69,7 @@ public:
template <class T1, class T2, class T3> template <class T1, class T2, class T3>
VectorC3(T1 &&x, T2 &&y, T3 &&z) VectorC3(T1 &&x, T2 &&y, T3 &&z)
: base(Rep{std::forward<T1>(x), std::forward<T2>(y), std::forward<T3>(z)}) {} : base(fwd_make_array<FT_>(std::forward<T1>(x), std::forward<T2>(y), std::forward<T3>(z))) {}
VectorC3(const FT_ &x, const FT_ &y, const FT_ &z, const FT_ &w) VectorC3(const FT_ &x, const FT_ &y, const FT_ &z, const FT_ &w)
: base( w != FT_(1) ? CGAL::make_array<FT_>(x/w, y/w, z/w) : base( w != FT_(1) ? CGAL::make_array<FT_>(x/w, y/w, z/w)

9
STL_Extension/include/CGAL/array.h
View File

@ -54,6 +54,15 @@ make_array(const T & t, const Args & ... args)
return a; return a;
} }
template< typename T, typename... Args >
BOOST_CXX14_CONSTEXPR
std::array< T, sizeof...(Args) >
fwd_make_array(Args && ... args)
{
std::array< T, sizeof...(Args) > a = { { static_cast<T>(args)... } };
return a;
}
// Functor version // Functor version
struct Construct_array struct Construct_array