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

functional (function<>::operator==, operator!=): Remove, per LWG 1240. 

2010-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/functional (function<>::operator==, operator!=):
	Remove, per LWG 1240.
	* testsuite/20_util/function/cmp/cmp_neg.cc: Adjust dg-* directives.

From-SVN: r165514
This commit is contained in:
Paolo Carlini 2010-10-15 17:14:57 +00:00 committed by Paolo Carlini
parent 695c3817fa
commit e74bf53a08
3 changed files with 10 additions and 16 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 @@
2010-10-15 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/functional (function<>::operator==, operator!=):
Remove, per LWG 1240.
* testsuite/20_util/function/cmp/cmp_neg.cc: Adjust dg-* directives.
2010-10-13 Jonathan Wakely <jwakely.gcc@gmail.com> 2010-10-13 Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/45990 PR libstdc++/45990

6
libstdc++-v3/include/std/functional
View File

@ -2096,12 +2096,6 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
template<typename _Functor> const _Functor* target() const; template<typename _Functor> const _Functor* target() const;
#endif #endif
// deleted overloads
template<typename _Res2, typename... _ArgTypes2>
void operator==(const function<_Res2(_ArgTypes2...)>&) const = delete;
template<typename _Res2, typename... _ArgTypes2>
void operator!=(const function<_Res2(_ArgTypes2...)>&) const = delete;
private: private:
typedef _Res (*_Invoker_type)(const _Any_data&, _ArgTypes...); typedef _Res (*_Invoker_type)(const _Any_data&, _ArgTypes...);
_Invoker_type _M_invoker; _Invoker_type _M_invoker;

14
libstdc++-v3/testsuite/20_util/function/cmp/cmp_neg.cc
View File

@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" } // { dg-options "-std=gnu++0x" }
// { dg-do compile } // { dg-do compile }
// Copyright (C) 2009 Free Software Foundation, Inc. // Copyright (C) 2009, 2010 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // 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 // software; you can redistribute it and/or modify it under the
@ -26,13 +26,7 @@ void test01()
{ {
std::function<void()> f1; std::function<void()> f1;
std::function<void()> f2; std::function<void()> f2;
f1 == f2; // { dg-error "deleted" } f1 == f2; // { dg-error "no match" }
f1 != f2; // { dg-error "deleted" } f1 != f2; // { dg-error "no match" }
}
int main()
{
test01();
return 0;
} }
// { dg-excess-errors "candidates are" }