diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-03-16 13:16:12 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-03-16 13:16:12 -0700 |
commit | 0fd6d52724555d70f663c7ec56db6419e95db6cc (patch) | |
tree | 3ffacd304527054dd7e54775ee6c240d26c13f0c /unsupported/test/cxx11_tensor_ref.cpp | |
parent | f218c0181d44d7dd129a77108ad6ec063cfbd6cc (diff) |
Fixed compilation error with clang
Diffstat (limited to 'unsupported/test/cxx11_tensor_ref.cpp')
-rw-r--r-- | unsupported/test/cxx11_tensor_ref.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/unsupported/test/cxx11_tensor_ref.cpp b/unsupported/test/cxx11_tensor_ref.cpp index c7b5ecddb..59530fe43 100644 --- a/unsupported/test/cxx11_tensor_ref.cpp +++ b/unsupported/test/cxx11_tensor_ref.cpp @@ -201,18 +201,18 @@ static void test_nested_ops_with_ref() Tensor<float, 4> t(2, 3, 5, 7); t.setRandom(); TensorMap<Tensor<const float, 4> > m(t.data(), 2, 3, 5, 7); - array<pair<ptrdiff_t, ptrdiff_t>, 4> paddings; - paddings[0] = make_pair(0, 0); - paddings[1] = make_pair(2, 1); - paddings[2] = make_pair(3, 4); - paddings[3] = make_pair(0, 0); - Eigen::DSizes<Eigen::DenseIndex, 4> shuffle_dims{0, 1, 2, 3}; + array<std::pair<ptrdiff_t, ptrdiff_t>, 4> paddings; + paddings[0] = std::make_pair(0, 0); + paddings[1] = std::make_pair(2, 1); + paddings[2] = std::make_pair(3, 4); + paddings[3] = std::make_pair(0, 0); + DSizes<Eigen::DenseIndex, 4> shuffle_dims{0, 1, 2, 3}; TensorRef<Tensor<const float, 4> > ref(m.pad(paddings)); - array<pair<ptrdiff_t, ptrdiff_t>, 4> trivial; - trivial[0] = make_pair(0, 0); - trivial[1] = make_pair(0, 0); - trivial[2] = make_pair(0, 0); - trivial[3] = make_pair(0, 0); + array<std::pair<ptrdiff_t, ptrdiff_t>, 4> trivial; + trivial[0] = std::make_pair(0, 0); + trivial[1] = std::make_pair(0, 0); + trivial[2] = std::make_pair(0, 0); + trivial[3] = std::make_pair(0, 0); Tensor<float, 4> padded = ref.shuffle(shuffle_dims).pad(trivial); VERIFY_IS_EQUAL(padded.dimension(0), 2+0); VERIFY_IS_EQUAL(padded.dimension(1), 3+3); |