King_DuckZ/vectorwrapper
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Warning fix

Browse source
This commit is contained in:
King_DuckZ 2016-09-05 21:30:17 +02:00
parent dbfed8c124
commit 41eed2c8ba
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/vectorwrapper/vectorops.hpp
View file

@ -12,7 +12,7 @@ namespace vwr {
template <typename V1, typename V2, std::size_t S> template <typename V1, typename V2, std::size_t S>
inline typename std::common_type<typename Vec<V1>::scalar_type, typename Vec<V2>::scalar_type>::type dot (const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight) { inline typename std::common_type<typename Vec<V1>::scalar_type, typename Vec<V2>::scalar_type>::type dot (const Vec<V1, S>& parLeft, const Vec<V2, S>& parRight) {
auto retval = parLeft.x() * parRight.x(); auto retval = parLeft.x() * parRight.x();
for (int z = 1; z < S; ++z) { for (std::size_t z = 1; z < S; ++z) {
retval += parLeft[z] * parRight[z]; retval += parLeft[z] * parRight[z];
} }
return retval; return retval;

3
include/vectorwrapper/vectorwrapper.inl
View file

@ -42,7 +42,7 @@ namespace vwr {
VecGetter<V>::get_at(m_wrapped, 1) = parY; VecGetter<V>::get_at(m_wrapped, 1) = parY;
const scalar_type args[sizeof...(Args)] = {parArgs...}; const scalar_type args[sizeof...(Args)] = {parArgs...};
for (int z = 0; z < sizeof...(Args); ++z) { for (std::size_t z = 0; z < sizeof...(Args); ++z) {
VecGetter<V>::get_at(m_wrapped, z + 2) = args[z]; VecGetter<V>::get_at(m_wrapped, z + 2) = args[z];
} }
} }
@ -137,7 +137,6 @@ namespace vwr {
assert(parIndex < VectorWrapperInfo<T>::dimensions); assert(parIndex < VectorWrapperInfo<T>::dimensions);
typedef T vector_type; typedef T vector_type;
typedef typename VectorWrapperInfo<T>::scalar_type scalar_type; typedef typename VectorWrapperInfo<T>::scalar_type scalar_type;
typedef scalar_type (vector_type::*coordinate_property);
static_assert(std::is_standard_layout<vector_type>::value, "Can't use this function with this vector_type"); static_assert(std::is_standard_layout<vector_type>::value, "Can't use this function with this vector_type");
const offsets_array_wrapper<T> oaw((bt::index_range<0, VectorWrapperInfo<T>::dimensions>())); const offsets_array_wrapper<T> oaw((bt::index_range<0, VectorWrapperInfo<T>::dimensions>()));
return *reinterpret_cast<scalar_type*>(reinterpret_cast<char*>(&parVec) + oaw.offsets[parIndex]); return *reinterpret_cast<scalar_type*>(reinterpret_cast<char*>(&parVec) + oaw.offsets[parIndex]);