Skip to content
Snippets Groups Projects
Commit fc94f4f1 authored by Andrew Wilson's avatar Andrew Wilson :elephant:
Browse files

BUG: Gcc fix

parent adafeb34
No related branches found
No related tags found
No related merge requests found
......@@ -177,12 +177,6 @@ TEST(imstkVecDataArrayTest, Iterators)
}
}
TEST(imstkVecDataArrayTest, ConstructorCast)
{
VecDataArray<long, 2> a{ Vec2i(1, 2), Vec2i(3, 4) };
EXPECT_EQ(Vec2i(1, 2), a[0].cast<int>());
}
TEST(imstkVecDataArrayTest, Erase)
{
VecDataArray<int, 2> a{ Vec2i(1, 1), Vec2i(2, 2), Vec2i(3, 3), Vec2i(4, 4) };
......
......@@ -125,8 +125,7 @@ public:
///
/// \brief Constructs from intializer list
///
template<typename U, int M>
VecDataArray(std::initializer_list<Eigen::Matrix<U, M, 1>> list) : DataArray<T>(static_cast<int>(list.size() * N)),
VecDataArray(std::initializer_list<Eigen::Matrix<T, N, 1>> list) : DataArray<T>(static_cast<int>(list.size() * N)),
m_vecSize(static_cast<int>(list.size())),
m_vecCapacity(static_cast<int>(list.size())),
m_dataCast(reinterpret_cast<VecType*>(DataArray<T>::m_data))
......@@ -134,7 +133,7 @@ public:
int j = 0;
for (auto i : list)
{
m_dataCast[j] = i.cast<T>();
m_dataCast[j] = i;
j++;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment