diff options
author | Eric Fiselier <eric@efcs.ca> | 2016-08-29 01:39:54 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2016-08-29 01:39:54 +0000 |
commit | 67c234417412b2d27e30ec30d6883ab9c8d60fc6 (patch) | |
tree | 66ece2f0dff487d9e17899d2b3677a9c32752f63 /libcxx/test/std | |
parent | 0678cc793a6d126b72cd20bb5d5a18f0eb6410cc (diff) | |
download | bcm5719-llvm-67c234417412b2d27e30ec30d6883ab9c8d60fc6.tar.gz bcm5719-llvm-67c234417412b2d27e30ec30d6883ab9c8d60fc6.zip |
Revert r279953 - Fix pair::operator=(TupleLike&&)
The test emits warnings causing the test-suite to fail. Since I want this
patch merged into 3.9 I'll recommit it with a clean test.
llvm-svn: 279954
Diffstat (limited to 'libcxx/test/std')
-rw-r--r-- | libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp b/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp deleted file mode 100644 index 43ffe4196f2..00000000000 --- a/libcxx/test/std/utilities/utility/pairs/pairs.pair/assign_tuple.pass.cpp +++ /dev/null @@ -1,135 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -// UNSUPPORTED: c++98, c++03 - -// <utility> - -// template <class T1, class T2> struct pair - -// template<class U, class V> pair& operator=(tuple<U, V>&& p); - -#include <utility> -#include <tuple> -#include <array> -#include <memory> -#include <cassert> - -struct CountingType { - static int constructed; - static int copy_constructed; - static int move_constructed; - static int assigned; - static int copy_assigned; - static int move_assigned; - static void reset() { - constructed = copy_constructed = move_constructed = 0; - assigned = copy_assigned = move_assigned = 0; - } - CountingType() : value(0) { ++constructed; } - CountingType(int v) : value(v) { ++constructed; } - CountingType(CountingType const& o) : value(o.value) { ++constructed; ++copy_constructed; } - CountingType(CountingType&& o) : value(o.value) { ++constructed; ++move_constructed; o.value = -1;} - - CountingType& operator=(CountingType const& o) { - ++assigned; - ++copy_assigned; - value = o.value; - return *this; - } - CountingType& operator=(CountingType&& o) { - ++assigned; - ++move_assigned; - value = o.value; - o.value = -1; - return *this; - } - int value; -}; -int CountingType::constructed; -int CountingType::copy_constructed; -int CountingType::move_constructed; -int CountingType::assigned; -int CountingType::copy_assigned; -int CountingType::move_assigned; - -int main() -{ - using C = CountingType; - { - using P = std::pair<int, C>; - using T = std::tuple<int, C>; - T t(42, C{42}); - P p(101, C{101}); - C::reset(); - p = t; - assert(C::constructed == 0); - assert(C::assigned == 1); - assert(C::copy_assigned == 1); - assert(C::move_assigned == 0); - assert(p.first == 42); - assert(p.second.value == 42); - } - { - using P = std::pair<int, C>; - using T = std::tuple<int, C>; - T t(42, -42); - P p(101, 101); - C::reset(); - p = std::move(t); - assert(C::constructed == 0); - assert(C::assigned == 1); - assert(C::copy_assigned == 0); - assert(C::move_assigned == 1); - assert(p.first == 42); - assert(p.second.value == -42); - } - { - using P = std::pair<C, C>; - using T = std::array<C, 2>; - T t = {42, -42}; - P p{101, 101}; - C::reset(); - p = t; - assert(C::constructed == 0); - assert(C::assigned == 2); - assert(C::copy_assigned == 2); - assert(C::move_assigned == 0); - assert(p.first.value == 42); - assert(p.second.value == -42); - } - { - using P = std::pair<C, C>; - using T = std::array<C, 2>; - T t = {42, -42}; - P p{101, 101}; - C::reset(); - p = t; - assert(C::constructed == 0); - assert(C::assigned == 2); - assert(C::copy_assigned == 2); - assert(C::move_assigned == 0); - assert(p.first.value == 42); - assert(p.second.value == -42); - } - { - using P = std::pair<C, C>; - using T = std::array<C, 2>; - T t = {42, -42}; - P p{101, 101}; - C::reset(); - p = std::move(t); - assert(C::constructed == 0); - assert(C::assigned == 2); - assert(C::copy_assigned == 0); - assert(C::move_assigned == 2); - assert(p.first.value == 42); - assert(p.second.value == -42); - } -} |