OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/40299 (Rope + C++0x mode = build error)

Browse Source 
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.

From-SVN: r148081
This commit is contained in:
Paolo Carlini 2009-06-02 09:06:31 +00:00 committed by Paolo Carlini
parent 70cb2d9f66
commit a67b92c3d7
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -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>

12
libstdc++-v3/include/ext/memory
View File

@ -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);
}
/**

27
libstdc++-v3/testsuite/ext/rope/40299.cc Normal file
View File

@ -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;
}