From 189f88ca35cd038da52bfdb338e37a0c15fa69bb Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 25 Jul 2016 01:45:07 +0000 Subject: Revert r276548 - Make pair/tuples assignment operators SFINAE properly. This is a breaking change. The SFINAE required is instantiated the second the class is instantiated, and this can cause hard SFINAE errors when applied to references to incomplete types. Ex. struct IncompleteType; extern IncompleteType it; std::tuple t(it); // SFINAE will blow up. llvm-svn: 276598 --- .../tuple/tuple.tuple/tuple.assign/copy.pass.cpp | 49 ---------------------- 1 file changed, 49 deletions(-) (limited to 'libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp') diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp index 6a24c278e1a..d5d02077972 100644 --- a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.pass.cpp @@ -19,22 +19,6 @@ #include #include -#include "test_macros.h" - -struct NonAssignable { - NonAssignable& operator=(NonAssignable const&) = delete; - NonAssignable& operator=(NonAssignable&&) = delete; -}; -struct CopyAssignable { - CopyAssignable& operator=(CopyAssignable const&) = default; - CopyAssignable& operator=(CopyAssignable &&) = delete; -}; -static_assert(std::is_copy_assignable::value, ""); -struct MoveAssignable { - MoveAssignable& operator=(MoveAssignable const&) = delete; - MoveAssignable& operator=(MoveAssignable&&) = default; -}; - int main() { { @@ -67,37 +51,4 @@ int main() assert(std::get<1>(t) == 'a'); assert(std::get<2>(t) == "some text"); } - { - // test reference assignment. - using T = std::tuple; - int x = 42; - int y = 100; - int x2 = -1; - int y2 = 500; - T t(x, std::move(y)); - T t2(x2, std::move(y2)); - t = t2; - assert(std::get<0>(t) == x2); - assert(&std::get<0>(t) == &x); - assert(std::get<1>(t) == y2); - assert(&std::get<1>(t) == &y); - } - { - // test that the implicitly generated copy assignment operator - // is properly deleted - using T = std::tuple>; - static_assert(!std::is_copy_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(!std::is_copy_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(std::is_copy_assignable::value, ""); - } - { - using T = std::tuple; - static_assert(!std::is_copy_assignable::value, ""); - } } -- cgit v1.2.3