git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR libstdc++/35541 (Legal C++ program can't be compiled with -D_GLIBCXX_DEBUG) 

2008-03-13  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/35541
	* include/debug/functions.h (__check_sorted_set_aux): Fix signature.
	* testsuite/25_algorithms/set_difference/35541.cc: New.

From-SVN: r133173
This commit is contained in:
Paolo Carlini 2008-03-13 17:35:40 +00:00 committed by Paolo Carlini
parent 2599b56f41
commit a6becb0ef5
3 changed files with 57 additions and 19 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 @@
2008-03-13 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/35541
* include/debug/functions.h (__check_sorted_set_aux): Fix signature.
* testsuite/25_algorithms/set_difference/35541.cc: New.
2008-03-07 Jakub Jelinek <jakub@redhat.com> 2008-03-07 Jakub Jelinek <jakub@redhat.com>
* config/abi/pre/gnu.ver: Move <system_error> related * config/abi/pre/gnu.ver: Move <system_error> related

34
libstdc++-v3/include/debug/functions.h
View File

@ -268,35 +268,31 @@ namespace __gnu_debug
return __check_sorted_aux(__first, __last, __pred, _Category()); return __check_sorted_aux(__first, __last, __pred, _Category());
} }
template<typename _InputIterator1, typename _InputIterator2> template<typename _InputIterator>
inline bool inline bool
__check_sorted_set_aux(const _InputIterator1& __first, __check_sorted_set_aux(const _InputIterator& __first,
const _InputIterator1& __last, const _InputIterator& __last,
const _InputIterator2&, std::__true_type) std::__true_type)
{ return __check_sorted(__first, __last); } { return __check_sorted(__first, __last); }
template<typename _InputIterator1, typename _InputIterator2> template<typename _InputIterator>
inline bool inline bool
__check_sorted_set_aux(const _InputIterator1&, __check_sorted_set_aux(const _InputIterator&,
const _InputIterator1&, const _InputIterator&,
const _InputIterator2&, std::__false_type) std::__false_type)
{ return true; } { return true; }
template<typename _InputIterator1, typename _InputIterator2, template<typename _InputIterator, typename _Predicate>
typename _Predicate>
inline bool inline bool
__check_sorted_set_aux(const _InputIterator1& __first, __check_sorted_set_aux(const _InputIterator& __first,
const _InputIterator1& __last, const _InputIterator& __last,
const _InputIterator2&, _Predicate __pred, _Predicate __pred, std::__true_type)
std::__true_type)
{ return __check_sorted(__first, __last, __pred); } { return __check_sorted(__first, __last, __pred); }
template<typename _InputIterator1, typename _InputIterator2, template<typename _InputIterator, typename _Predicate>
typename _Predicate>
inline bool inline bool
__check_sorted_set_aux(const _InputIterator1&, __check_sorted_set_aux(const _InputIterator&,
const _InputIterator1&, const _InputIterator&, _Predicate,
const _InputIterator2&, _Predicate,
std::__false_type) std::__false_type)
{ return true; } { return true; }

36
libstdc++-v3/testsuite/25_algorithms/set_difference/35541.cc Normal file
View File

@ -0,0 +1,36 @@
// Copyright (C) 2008 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 2, 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 COPYING. If not, write to the Free
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// { dg-options "-D_GLIBCXX_DEBUG" }
// { dg-do compile }
// libstdc++/35541
#include <set>
#include <iterator>
#include <algorithm>
void test01()
{
std::set<std::pair<unsigned,int> > mFactors;
std::set<std::pair<unsigned,int> > secondFactor;
std::set_difference(mFactors.begin(), mFactors.end(),
mFactors.begin(), mFactors.end(),
std::insert_iterator<std::set<std::pair<unsigned,int> > >
(secondFactor, secondFactor.end()));
}