diff options
| author | Jan Hubicka <jh@suse.cz> | 2009-06-03 09:16:04 +0000 |
|---|---|---|
| committer | Jan Hubicka <jh@suse.cz> | 2009-06-03 09:16:04 +0000 |
| commit | 99e50ac8d54fb8da232aa8b7f76a320cb266eb86 (patch) | |
| tree | b6f4c1d027ca0e6cc1d3d1b09b87dfec2aa0b014 /libstdc++-v3 | |
| parent | 950a33761591a506d24d6e67cac1a031fa3de015 (diff) | |
Merge from mainline.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/pretty-ipa@148117 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/memory | 12 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/ext/rope/40299.cc | 27 |
3 files changed, 39 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1a237c2531a..2790cc89e0e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2009-06-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR libstdc++/40299 + * include/ext/memory: Fully qualify calls with __gnu_cxx. + * testsuite/ext/rope/40299.cc: New. + 2009-05-28 Tom Tromey <tromey@redhat.com> Phil Muldoon <pmuldoon@redhat.com> Jonathan Wakely <jwakely.gcc@gmail.com> diff --git a/libstdc++-v3/include/ext/memory b/libstdc++-v3/include/ext/memory index 048ebe6ca6a..7776d730a4a 100644 --- a/libstdc++-v3/include/ext/memory +++ b/libstdc++-v3/include/ext/memory @@ -102,9 +102,9 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) template<typename _InputIter, typename _Size, typename _ForwardIter> inline pair<_InputIter, _ForwardIter> __uninitialized_copy_n(_InputIter __first, _Size __count, - _ForwardIter __result) - { return __uninitialized_copy_n(__first, __count, __result, - __iterator_category(__first)); } + _ForwardIter __result) + { return __gnu_cxx::__uninitialized_copy_n(__first, __count, __result, + __iterator_category(__first)); } /** * @brief Copies the range [first,last) into result. @@ -120,8 +120,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) inline pair<_InputIter, _ForwardIter> uninitialized_copy_n(_InputIter __first, _Size __count, _ForwardIter __result) - { return __uninitialized_copy_n(__first, __count, __result, - __iterator_category(__first)); } + { return __gnu_cxx::__uninitialized_copy_n(__first, __count, __result, + __iterator_category(__first)); } // An alternative version of uninitialized_copy_n that constructs @@ -154,7 +154,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) _ForwardIter __result, std::allocator<_Tp>) { - return uninitialized_copy_n(__first, __count, __result); + return __gnu_cxx::uninitialized_copy_n(__first, __count, __result); } /** diff --git a/libstdc++-v3/testsuite/ext/rope/40299.cc b/libstdc++-v3/testsuite/ext/rope/40299.cc new file mode 100644 index 00000000000..4d83fc98ce4 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/rope/40299.cc @@ -0,0 +1,27 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2009 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 even 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/>. + +#include <ext/rope> + +// libstdc++/40299 +void test01() +{ + __gnu_cxx::crope asdf; +} |