diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1_impl/utility | 22 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/pair/range_access.cc | 33 |
4 files changed, 9 insertions, 55 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6da10e1c917..42db5964de8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2010-08-05 Paolo Carlini <paolo.carlini@oracle.com> + * include/tr1_impl/utility (begin, end): Remove per GB 85. + * testsuite/20_util/pair/range_access.cc: Remove. + + * include/std/functional (function<>::function()): Remove explicit, + per JP 3. + +2010-08-05 Paolo Carlini <paolo.carlini@oracle.com> + * include/bits/move.h (forward): Update to N3092. (identity): Remove (US 92 is NAD). * include/debug/set.h: Fix move constructor to simply use move. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 752e78325a3..d137f47eb09 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1786,7 +1786,6 @@ namespace std * @brief Default construct creates an empty function call wrapper. * @post @c !(bool)*this */ - explicit function() : _Function_base() { } /** diff --git a/libstdc++-v3/include/tr1_impl/utility b/libstdc++-v3/include/tr1_impl/utility index c3b3527f963..71b8719f5ff 100644 --- a/libstdc++-v3/include/tr1_impl/utility +++ b/libstdc++-v3/include/tr1_impl/utility @@ -1,6 +1,6 @@ // TR1 utility -*- C++ -*- -// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. // // 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 @@ -115,26 +115,6 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1 get(const std::pair<_Tp1, _Tp2>& __in) { return __pair_get<_Int>::__const_get(__in); } -#ifdef _GLIBCXX_INCLUDE_AS_CXX0X - /** - * @brief Return the first of a pair containing two input iterators. - * @param p Pair. - */ - template<class _InputIterator> - inline _InputIterator - begin(const std::pair<_InputIterator, _InputIterator>& __p) - { return __p.first; } - - /** - * @brief Return the second of a pair containing two input iterators. - * @param p Pair. - */ - template<class _InputIterator> - inline _InputIterator - end(const std::pair<_InputIterator, _InputIterator>& __p) - { return __p.second; } -#endif - _GLIBCXX_END_NAMESPACE_TR1 } diff --git a/libstdc++-v3/testsuite/20_util/pair/range_access.cc b/libstdc++-v3/testsuite/20_util/pair/range_access.cc deleted file mode 100644 index 036b78cc419..00000000000 --- a/libstdc++-v3/testsuite/20_util/pair/range_access.cc +++ /dev/null @@ -1,33 +0,0 @@ -// { dg-do compile } -// { dg-options "-std=gnu++0x" } - -// Copyright (C) 2010 Free Software Foundation, Inc. -// -// 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 -// Free Software Foundation; either version 3, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without Pred the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING3. If not see -// <http://www.gnu.org/licenses/>. - -// 20.3.5.4, pair range access: [pair.range] - -#include <utility> -#include <vector> - -void -test01() -{ - std::vector<double> v{1.0, 2.0, 3.0}; - auto p = std::make_pair(v.begin(), v.end()); - std::begin(p); - std::end(p); -} |