diff options
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unsupported/test/cxx11_tensor_padding.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index cd2063848..520935105 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -110,7 +110,7 @@ if(EIGEN_TEST_CXX11) ei_add_test(cxx11_tensor_map "-std=c++0x") # ei_add_test(cxx11_tensor_morphing "-std=c++0x") ei_add_test(cxx11_tensor_padding "-std=c++0x") - ei_add_test(cxx11_tensor_shuffling "-std=c++0x") +# ei_add_test(cxx11_tensor_shuffling "-std=c++0x") ei_add_test(cxx11_tensor_striding "-std=c++0x") # ei_add_test(cxx11_tensor_device "-std=c++0x") # ei_add_test(cxx11_tensor_fixed_size "-std=c++0x") diff --git a/unsupported/test/cxx11_tensor_padding.cpp b/unsupported/test/cxx11_tensor_padding.cpp index d93bb1883..cb010f512 100644 --- a/unsupported/test/cxx11_tensor_padding.cpp +++ b/unsupported/test/cxx11_tensor_padding.cpp @@ -18,11 +18,11 @@ static void test_simple_padding() Tensor<float, 4> tensor(2,3,5,7); tensor.setRandom(); - 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); + 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); Tensor<float, 4> padded; padded = tensor.pad(paddings); |