diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-10-16 14:52:50 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-10-16 14:52:50 -0700 |
commit | ae697b471c0d3961ebdb633e30046e5fe31fbe24 (patch) | |
tree | 3ab599542dd7a49f0cf033688874c880f5e5305a /unsupported/test/cxx11_tensor_fixed_size.cpp | |
parent | 94e47798f4e462b857a00b4ca60c954c71d16605 (diff) |
Silenced a few compilation warnings
Generalized a TensorMap constructor
Diffstat (limited to 'unsupported/test/cxx11_tensor_fixed_size.cpp')
-rw-r--r-- | unsupported/test/cxx11_tensor_fixed_size.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unsupported/test/cxx11_tensor_fixed_size.cpp b/unsupported/test/cxx11_tensor_fixed_size.cpp index b0501aaa3..99ffc7f07 100644 --- a/unsupported/test/cxx11_tensor_fixed_size.cpp +++ b/unsupported/test/cxx11_tensor_fixed_size.cpp @@ -32,10 +32,10 @@ static void test_1d() vec1(5) = 42.0; vec2(5) = 5.0; float data3[6]; - TensorMap<TensorFixedSize<float, Sizes<6> > > vec3(data3, 6); + TensorMap<TensorFixedSize<float, Sizes<6> > > vec3(data3, Sizes<6>()); vec3 = vec1.sqrt(); float data4[6]; - TensorMap<TensorFixedSize<float, Sizes<6>, RowMajor> > vec4(data4, 6); + TensorMap<TensorFixedSize<float, Sizes<6>, RowMajor> > vec4(data4, Sizes<6>()); vec4 = vec2.sqrt(); VERIFY_IS_EQUAL((vec3.size()), 6); @@ -68,9 +68,9 @@ static void test_1d() static void test_2d() { float data1[6]; - TensorMap<TensorFixedSize<float, Sizes<2, 3> >> mat1(data1,2,3); + TensorMap<TensorFixedSize<float, Sizes<2, 3> >> mat1(data1, Sizes<2, 3>()); float data2[6]; - TensorMap<TensorFixedSize<float, Sizes<2, 3>, RowMajor>> mat2(data2,2,3); + TensorMap<TensorFixedSize<float, Sizes<2, 3>, RowMajor>> mat2(data2, Sizes<2, 3>()); VERIFY_IS_EQUAL((mat1.size()), 2*3); // VERIFY_IS_EQUAL((mat1.dimension(0)), 2); @@ -166,7 +166,7 @@ static void test_array() for (int i = 0; i < 2; ++i) { for (int j = 0; j < 3; ++j) { for (int k = 0; k < 7; ++k) { - mat1(array<ptrdiff_t, 3>(i,j,k)) = val; + mat1(array<ptrdiff_t, 3>{{i,j,k}}) = val; val += 1.0; } } |