aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/test/cxx11_tensor_forced_eval.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-04-29 15:48:59 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-04-29 15:48:59 -0700
commit1131a984a67b3ed33333c3f253cd418a57c02f20 (patch)
tree9e967651c0818075676bd3d51700290ffddfe55d /unsupported/test/cxx11_tensor_forced_eval.cpp
parent46bcb70969829f243eaae0360b70859e68450dee (diff)
Made the cxx11_tensor_forced_eval compile without c++11.
Diffstat (limited to 'unsupported/test/cxx11_tensor_forced_eval.cpp')
-rw-r--r--unsupported/test/cxx11_tensor_forced_eval.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/unsupported/test/cxx11_tensor_forced_eval.cpp b/unsupported/test/cxx11_tensor_forced_eval.cpp
index ad9de867d..45d7345e9 100644
--- a/unsupported/test/cxx11_tensor_forced_eval.cpp
+++ b/unsupported/test/cxx11_tensor_forced_eval.cpp
@@ -22,14 +22,15 @@ static void test_simple()
m1.setRandom();
m2.setRandom();
- TensorMap<Tensor<float, 2>> mat1(m1.data(), 3,3);
- TensorMap<Tensor<float, 2>> mat2(m2.data(), 3,3);
+ TensorMap<Tensor<float, 2> > mat1(m1.data(), 3,3);
+ TensorMap<Tensor<float, 2> > mat2(m2.data(), 3,3);
Tensor<float, 2> mat3(3,3);
mat3 = mat1;
typedef Tensor<float, 1>::DimensionPair DimPair;
- Eigen::array<DimPair, 1> dims({{DimPair(1, 0)}});
+ Eigen::array<DimPair, 1> dims;
+ dims[0] = DimPair(1, 0);
mat3 = mat3.contract(mat2, dims).eval();
@@ -60,7 +61,7 @@ static void test_const()
Eigen::array<int, 2> bcast;
bcast[0] = 3;
bcast[1] = 1;
- const TensorMap<Tensor<const float, 2>> input_tensor(input.data(), 3, 3);
+ const TensorMap<Tensor<const float, 2> > input_tensor(input.data(), 3, 3);
Tensor<float, 2> output_tensor= (input_tensor - input_tensor.maximum(depth_dim).eval().reshape(dims2d).broadcast(bcast));
for (int i = 0; i < 3; ++i) {