2001-06-27 19:09:53 +02:00
|
|
|
// Pair implementation -*- C++ -*-
|
|
|
|
|
2011-05-16 20:09:17 +02:00
|
|
|
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
|
|
|
// 2010, 2011
|
2007-06-18 19:22:53 +02:00
|
|
|
// Free Software Foundation, Inc.
|
2001-06-27 19:09:53 +02:00
|
|
|
//
|
|
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
|
|
// software; you can redistribute it and/or modify it under the
|
|
|
|
// terms of the GNU General Public License as published by the
|
2009-04-09 17:00:19 +02:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2001-06-27 19:09:53 +02:00
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
2001-06-27 19:09:53 +02:00
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
2001-06-27 19:09:53 +02:00
|
|
|
|
2000-10-05 13:27:02 +02:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
* Copyright (c) 1994
|
|
|
|
* Hewlett-Packard Company
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
|
|
* provided that the above copyright notice appear in all copies and
|
|
|
|
* that both that copyright notice and this permission notice appear
|
|
|
|
* in supporting documentation. Hewlett-Packard Company makes no
|
|
|
|
* representations about the suitability of this software for any
|
|
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Copyright (c) 1996,1997
|
|
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
|
|
* provided that the above copyright notice appear in all copies and
|
|
|
|
* that both that copyright notice and this permission notice appear
|
|
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
|
|
* representations about the suitability of this software for any
|
|
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
|
|
*/
|
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
/** @file bits/stl_pair.h
|
c_io_stdio.h: Correct grammar in comments.
2001-11-02 Phil Edwards <pme@gcc.gnu.org>
* config/io/c_io_stdio.h: Correct grammar in comments.
* docs/doxygen/Intro.3: Expand "top-level" man page.
* docs/doxygen/doxygroups.cc: New module definitions (comments).
* docs/doxygen/mainpage.doxy: Tweaks.
* docs/doxygen/run_doxygen: Update Doxygen version, massage man pages.
Add @file hooks so that headers are considered to be documented.
* include/bits/basic_ios.h, include/bits/basic_file.h,
include/bits/basic_string.h, include/bits/boost_concept_check.h,
include/bits/char_traits.h, include/bits/codecvt.h,
include/bits/concept_check.h, include/bits/cpp_type_traits.h,
include/bits/fpos.h, include/bits/gslice.h, include/bits/gslice_array.h,
include/bits/indirect_array.h, include/bits/ios_base.h,
include/bits/locale_facets.h, include/bits/localefwd.h,
include/bits/mask_array.h, include/bits/pthread_allocimpl.h,
include/bits/slice.h, include/bits/slice_array.h,
include/bits/std_algorithm.h, include/bits/std_bitset.h,
include/bits/std_complex.h, include/bits/std_deque.h,
include/bits/std_fstream.h, include/bits/std_functional.h,
include/bits/std_iomanip.h, include/bits/std_ios.h,
include/bits/std_iosfwd.h, include/bits/std_iostream.h,
include/bits/std_istream.h, include/bits/std_iterator.h,
include/bits/std_limits.h, include/bits/std_list.h,
include/bits/std_locale.h, include/bits/std_map.h,
include/bits/std_memory.h, include/bits/std_numeric.h,
include/bits/std_ostream.h, include/bits/std_queue.h,
include/bits/std_set.h, include/bits/std_sstream.h,
include/bits/std_stack.h, include/bits/std_streambuf.h,
include/bits/std_string.h, include/bits/std_utility.h,
include/bits/std_valarray.h, include/bits/std_vector.h,
include/bits/stl_algo.h, include/bits/stl_alloc.h,
include/bits/stl_bvector.h, include/bits/stl_construct.h,
include/bits/stl_deque.h, include/bits/stl_heap.h,
include/bits/stl_iterator.h, include/bits/stl_iterator_base_funcs.h,
include/bits/stl_iterator_base_types.h, include/bits/stl_list.h,
include/bits/stl_map.h, include/bits/stl_multimap.h,
include/bits/stl_multiset.h, include/bits/stl_numeric.h,
include/bits/stl_pair.h, include/bits/stl_pthread_alloc.h,
include/bits/stl_queue.h, include/bits/stl_raw_storage_iter.h,
include/bits/stl_relops.h, include/bits/stl_set.h,
include/bits/stl_stack.h, include/bits/stl_tempbuf.h,
include/bits/stl_threads.h, include/bits/stl_tree.h,
include/bits/stl_uninitialized.h, include/bits/stl_vector.h,
include/bits/stream_iterator.h, include/bits/streambuf_iterator.h,
include/bits/stringfwd.h, include/bits/type_traits.h,
include/bits/valarray_array.h, include/bits/valarray_meta.h:
Add hooks, tweak comments only.
* include/bits/stl_algobase.h (swap, min, iter_swap): Also
document these functions.
* include/bits/stl_function.h: Tweak link comments.
From-SVN: r46717
2001-11-02 18:38:11 +01:00
|
|
|
* This is an internal header file, included by other library headers.
|
2010-12-19 10:21:16 +01:00
|
|
|
* Do not attempt to use it directly. @headername{utility}
|
2000-10-05 13:27:02 +02:00
|
|
|
*/
|
|
|
|
|
2007-06-18 19:22:53 +02:00
|
|
|
#ifndef _STL_PAIR_H
|
|
|
|
#define _STL_PAIR_H 1
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2010-04-30 11:52:41 +02:00
|
|
|
#include <bits/move.h> // for std::move / std::forward, and std::swap
|
2007-10-08 13:16:51 +02:00
|
|
|
|
2009-10-29 20:26:04 +01:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
2010-04-30 11:52:41 +02:00
|
|
|
#include <type_traits> // for std::__decay_and_strip too
|
2009-10-29 20:26:04 +01:00
|
|
|
#endif
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2005-12-19 01:56:05 +01:00
|
|
|
|
2010-04-30 11:52:41 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
2010-11-02 03:35:28 +01:00
|
|
|
/// piecewise_construct_t
|
2010-04-30 11:52:41 +02:00
|
|
|
struct piecewise_construct_t { };
|
|
|
|
|
2010-11-02 03:35:28 +01:00
|
|
|
/// piecewise_construct
|
|
|
|
constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
|
2010-09-27 19:27:43 +02:00
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
// Forward declarations.
|
2010-04-30 11:52:41 +02:00
|
|
|
template<typename...>
|
|
|
|
class tuple;
|
|
|
|
|
2011-09-10 02:47:02 +02:00
|
|
|
template<std::size_t...>
|
2010-04-30 11:52:41 +02:00
|
|
|
struct _Index_tuple;
|
|
|
|
#endif
|
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
/// Struct holding two objects of arbitrary type.
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2004-02-06 22:32:48 +01:00
|
|
|
struct pair
|
|
|
|
{
|
2010-12-19 10:21:16 +01:00
|
|
|
typedef _T1 first_type; /// @c first_type is the first bound type
|
|
|
|
typedef _T2 second_type; /// @c second_type is the second bound type
|
2004-02-06 22:32:48 +01:00
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
_T1 first; /// @c first is a copy of the first object
|
|
|
|
_T2 second; /// @c second is a copy of the second object
|
2004-02-06 22:32:48 +01:00
|
|
|
|
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
|
|
// 265. std::pair::pair() effects overly restrictive
|
|
|
|
/** The default constructor creates @c first and @c second using their
|
|
|
|
* respective default constructors. */
|
2010-11-02 03:35:28 +01:00
|
|
|
_GLIBCXX_CONSTEXPR pair()
|
2004-05-13 14:50:53 +02:00
|
|
|
: first(), second() { }
|
2004-02-06 22:32:48 +01:00
|
|
|
|
|
|
|
/** Two objects may be passed to a @c pair constructor to be copied. */
|
2010-11-24 17:33:14 +01:00
|
|
|
_GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b)
|
2004-05-13 14:50:53 +02:00
|
|
|
: first(__a), second(__b) { }
|
2004-02-06 22:32:48 +01:00
|
|
|
|
2010-11-24 17:33:14 +01:00
|
|
|
/** There is also a templated copy ctor for the @c pair class itself. */
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
#ifndef __GXX_EXPERIMENTAL_CXX0X__
|
2010-11-24 17:33:14 +01:00
|
|
|
template<class _U1, class _U2>
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
pair(const pair<_U1, _U2>& __p)
|
|
|
|
: first(__p.first), second(__p.second) { }
|
|
|
|
#else
|
|
|
|
template<class _U1, class _U2, class = typename
|
|
|
|
enable_if<__and_<is_convertible<const _U1&, _T1>,
|
|
|
|
is_convertible<const _U2&, _T2>>::value>::type>
|
|
|
|
constexpr pair(const pair<_U1, _U2>& __p)
|
2010-11-24 17:33:14 +01:00
|
|
|
: first(__p.first), second(__p.second) { }
|
|
|
|
|
|
|
|
constexpr pair(const pair&) = default;
|
|
|
|
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
// XXX Defaulted?!? Breaks std::map!!!
|
|
|
|
pair(pair&& __p)
|
|
|
|
noexcept(__and_<is_nothrow_move_constructible<_T1>,
|
|
|
|
is_nothrow_move_constructible<_T2>>::value)
|
|
|
|
: first(std::forward<first_type>(__p.first)),
|
|
|
|
second(std::forward<second_type>(__p.second)) { }
|
2010-05-20 16:08:53 +02:00
|
|
|
|
2009-10-30 03:29:14 +01:00
|
|
|
// DR 811.
|
|
|
|
template<class _U1, class = typename
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
enable_if<is_convertible<_U1, _T1>::value>::type>
|
2011-07-23 05:17:11 +02:00
|
|
|
constexpr pair(_U1&& __x, const _T2& __y)
|
2010-11-24 17:33:14 +01:00
|
|
|
: first(std::forward<_U1>(__x)), second(__y) { }
|
2009-10-30 03:29:14 +01:00
|
|
|
|
|
|
|
template<class _U2, class = typename
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
enable_if<is_convertible<_U2, _T2>::value>::type>
|
2011-07-23 05:17:11 +02:00
|
|
|
constexpr pair(const _T1& __x, _U2&& __y)
|
2010-11-24 17:33:14 +01:00
|
|
|
: first(__x), second(std::forward<_U2>(__y)) { }
|
2009-10-30 03:29:14 +01:00
|
|
|
|
|
|
|
template<class _U1, class _U2, class = typename
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
enable_if<__and_<is_convertible<_U1, _T1>,
|
|
|
|
is_convertible<_U2, _T2>>::value>::type>
|
2011-07-23 05:17:11 +02:00
|
|
|
constexpr pair(_U1&& __x, _U2&& __y)
|
2010-11-24 17:33:14 +01:00
|
|
|
: first(std::forward<_U1>(__x)), second(std::forward<_U2>(__y)) { }
|
2007-10-08 13:16:51 +02:00
|
|
|
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
template<class _U1, class _U2, class = typename
|
|
|
|
enable_if<__and_<is_convertible<_U1, _T1>,
|
|
|
|
is_convertible<_U2, _T2>>::value>::type>
|
2011-07-23 05:17:11 +02:00
|
|
|
constexpr pair(pair<_U1, _U2>&& __p)
|
2010-06-10 12:24:46 +02:00
|
|
|
: first(std::forward<_U1>(__p.first)),
|
|
|
|
second(std::forward<_U2>(__p.second)) { }
|
2007-10-08 13:16:51 +02:00
|
|
|
|
2010-11-24 17:33:14 +01:00
|
|
|
template<class... _Args1, class... _Args2>
|
|
|
|
pair(piecewise_construct_t,
|
|
|
|
tuple<_Args1...> __first, tuple<_Args2...> __second)
|
|
|
|
: first(__cons<first_type>(std::move(__first))),
|
|
|
|
second(__cons<second_type>(std::move(__second))) { }
|
|
|
|
|
|
|
|
pair&
|
|
|
|
operator=(const pair& __p)
|
|
|
|
{
|
|
|
|
first = __p.first;
|
|
|
|
second = __p.second;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2007-10-08 13:16:51 +02:00
|
|
|
pair&
|
|
|
|
operator=(pair&& __p)
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
noexcept(__and_<is_nothrow_move_assignable<_T1>,
|
|
|
|
is_nothrow_move_assignable<_T2>>::value)
|
2010-11-24 17:33:14 +01:00
|
|
|
{
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
first = std::forward<first_type>(__p.first);
|
|
|
|
second = std::forward<second_type>(__p.second);
|
2007-10-08 13:16:51 +02:00
|
|
|
return *this;
|
|
|
|
}
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
|
2010-05-20 16:08:53 +02:00
|
|
|
template<class _U1, class _U2>
|
2010-11-24 17:33:14 +01:00
|
|
|
pair&
|
|
|
|
operator=(const pair<_U1, _U2>& __p)
|
2010-05-20 16:08:53 +02:00
|
|
|
{
|
|
|
|
first = __p.first;
|
|
|
|
second = __p.second;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
template<class _U1, class _U2>
|
2010-11-24 17:33:14 +01:00
|
|
|
pair&
|
|
|
|
operator=(pair<_U1, _U2>&& __p)
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
{
|
type_traits (__or_, __and_): Add trivial definitions for a single element.
2011-05-30 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/type_traits (__or_, __and_): Add trivial definitions
for a single element.
* include/bits/stl_pair.h: Use __and_ in noexcept specs and
constraints.
(pair<>::pair(pair&&)): Define.
(pair<>::pair(const pair<>&)): Constrain with is_convertible.
(pair<>::pair(pair<>&&)): Likewise, remove noexcept.
* include/std/tuple: Use __and_ in noexcept specs and constraints.
(_Tuple_impl<>::_Tuple_impl(allocator_arg_t, const _Alloc&,
_Tuple_impl&&)): Remove noexcept.
(tuple<>::tuple(_UElements&&...), tuple(const tuple<_UElements...>&),
tuple(tuple<_UElements...>&&), tuple(const pair<_U1, _U2>&),
tuple(pair<_U1, _U2>&&)): Constrain with is_convertible.
* testsuite/20_util/tuple/moveable2.cc: Use = delete.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc:
Adjust dg-error line numbers.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
Likewise.
* testsuite/20_util/declval/requirements/1_neg.cc: Likewise.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Likewise.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Likewise.
From-SVN: r174464
2011-05-31 04:29:22 +02:00
|
|
|
first = std::forward<_U1>(__p.first);
|
|
|
|
second = std::forward<_U2>(__p.second);
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-05-19 00:15:56 +02:00
|
|
|
swap(pair& __p)
|
2011-05-16 20:09:17 +02:00
|
|
|
noexcept(noexcept(swap(first, __p.first))
|
|
|
|
&& noexcept(swap(second, __p.second)))
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
{
|
|
|
|
using std::swap;
|
|
|
|
swap(first, __p.first);
|
2010-11-24 17:33:14 +01:00
|
|
|
swap(second, __p.second);
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
}
|
2010-04-30 11:52:41 +02:00
|
|
|
|
|
|
|
private:
|
|
|
|
template<typename _Tp, typename... _Args>
|
2010-11-24 17:33:14 +01:00
|
|
|
static _Tp
|
|
|
|
__cons(tuple<_Args...>&&);
|
2010-04-30 11:52:41 +02:00
|
|
|
|
2011-09-10 02:47:02 +02:00
|
|
|
template<typename _Tp, typename... _Args, std::size_t... _Indexes>
|
2010-11-24 17:33:14 +01:00
|
|
|
static _Tp
|
|
|
|
__do_cons(tuple<_Args...>&&, const _Index_tuple<_Indexes...>&);
|
2007-10-08 13:16:51 +02:00
|
|
|
#endif
|
2004-02-06 22:32:48 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
/// Two pairs of the same type are equal iff their members are equal.
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2010-11-24 17:33:14 +01:00
|
|
|
inline _GLIBCXX_CONSTEXPR bool
|
2004-02-06 22:32:48 +01:00
|
|
|
operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
|
|
{ return __x.first == __y.first && __x.second == __y.second; }
|
|
|
|
|
2008-08-13 01:14:10 +02:00
|
|
|
/// <http://gcc.gnu.org/onlinedocs/libstdc++/manual/utilities.html>
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2010-11-24 17:33:14 +01:00
|
|
|
inline _GLIBCXX_CONSTEXPR bool
|
2004-02-06 22:32:48 +01:00
|
|
|
operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
|
|
{ return __x.first < __y.first
|
|
|
|
|| (!(__y.first < __x.first) && __x.second < __y.second); }
|
|
|
|
|
|
|
|
/// Uses @c operator== to find the result.
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2010-11-24 17:33:14 +01:00
|
|
|
inline _GLIBCXX_CONSTEXPR bool
|
2004-02-06 22:32:48 +01:00
|
|
|
operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
|
|
{ return !(__x == __y); }
|
|
|
|
|
|
|
|
/// Uses @c operator< to find the result.
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2010-11-24 17:33:14 +01:00
|
|
|
inline _GLIBCXX_CONSTEXPR bool
|
2004-02-06 22:32:48 +01:00
|
|
|
operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
|
|
{ return __y < __x; }
|
|
|
|
|
|
|
|
/// Uses @c operator< to find the result.
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2010-11-24 17:33:14 +01:00
|
|
|
inline _GLIBCXX_CONSTEXPR bool
|
2004-02-06 22:32:48 +01:00
|
|
|
operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
|
|
{ return !(__y < __x); }
|
|
|
|
|
|
|
|
/// Uses @c operator< to find the result.
|
2004-05-13 14:50:53 +02:00
|
|
|
template<class _T1, class _T2>
|
2010-11-24 17:33:14 +01:00
|
|
|
inline _GLIBCXX_CONSTEXPR bool
|
2004-02-06 22:32:48 +01:00
|
|
|
operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
|
|
|
|
{ return !(__x < __y); }
|
|
|
|
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
|
|
/// See std::pair::swap().
|
2009-01-07 14:00:48 +01:00
|
|
|
// Note: no std::swap overloads in C++03 mode, this has performance
|
|
|
|
// implications, see, eg, libstdc++/38466.
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
template<class _T1, class _T2>
|
|
|
|
inline void
|
|
|
|
swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
|
2011-05-16 20:09:17 +02:00
|
|
|
noexcept(noexcept(__x.swap(__y)))
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
{ __x.swap(__y); }
|
|
|
|
#endif
|
|
|
|
|
2004-02-06 22:32:48 +01:00
|
|
|
/**
|
|
|
|
* @brief A convenience wrapper for creating a pair from two objects.
|
2011-08-07 09:27:06 +02:00
|
|
|
* @param __x The first object.
|
|
|
|
* @param __y The second object.
|
2004-02-06 22:32:48 +01:00
|
|
|
* @return A newly-constructed pair<> object of the appropriate type.
|
|
|
|
*
|
|
|
|
* The standard requires that the objects be passed by reference-to-const,
|
|
|
|
* but LWG issue #181 says they should be passed by const value. We follow
|
|
|
|
* the LWG by default.
|
|
|
|
*/
|
2003-10-12 12:12:09 +02:00
|
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
2004-02-06 22:32:48 +01:00
|
|
|
// 181. make_pair() unintended behavior
|
2010-11-24 17:33:14 +01:00
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
2007-11-08 15:40:33 +01:00
|
|
|
// NB: DR 706.
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
template<class _T1, class _T2>
|
2011-08-11 19:53:05 +02:00
|
|
|
constexpr pair<typename __decay_and_strip<_T1>::__type,
|
|
|
|
typename __decay_and_strip<_T2>::__type>
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
make_pair(_T1&& __x, _T2&& __y)
|
|
|
|
{
|
2010-11-24 17:33:14 +01:00
|
|
|
typedef typename __decay_and_strip<_T1>::__type __ds_type1;
|
|
|
|
typedef typename __decay_and_strip<_T2>::__type __ds_type2;
|
|
|
|
typedef pair<__ds_type1, __ds_type2> __pair_type;
|
|
|
|
return __pair_type(std::forward<_T1>(__x), std::forward<_T2>(__y));
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
}
|
2010-11-24 17:33:14 +01:00
|
|
|
#else
|
|
|
|
template<class _T1, class _T2>
|
|
|
|
inline pair<_T1, _T2>
|
|
|
|
make_pair(_T1 __x, _T2 __y)
|
|
|
|
{ return pair<_T1, _T2>(__x, __y); }
|
stl_algobase.h (swap): Move...
2007-10-10 Paolo Carlini <pcarlini@suse.de>
Chris Fairles <chris.fairles@gmail.com>
* include/bits/stl_algobase.h (swap): Move...
* include/bits/stl_move.h: ... here.
* include/bits/stl_pair.h (pair<>::pair(_U1&&, _U2&&),
pair<>::pair(pair<>&&), pair<>::operator=(pair<>&&),
pair<>::swap(pair&&), swap(&, &), swap(&&, &), swap(&, &&),
make_pair(_T1&&, _T2&&)): Add.
* testsuite/20_util/pair/swap.cc: Add.
Co-Authored-By: Chris Fairles <chris.fairles@gmail.com>
From-SVN: r129198
2007-10-10 11:29:11 +02:00
|
|
|
#endif
|
2005-12-19 01:56:05 +01:00
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2000-10-05 13:27:02 +02:00
|
|
|
|
2007-06-18 19:22:53 +02:00
|
|
|
#endif /* _STL_PAIR_H */
|