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:
parent
695c3817fa
commit
e74bf53a08
|
@ -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>
|
||||
|
||||
PR libstdc++/45990
|
||||
|
|
|
@ -2096,12 +2096,6 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
|
|||
template<typename _Functor> const _Functor* target() const;
|
||||
#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:
|
||||
typedef _Res (*_Invoker_type)(const _Any_data&, _ArgTypes...);
|
||||
_Invoker_type _M_invoker;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// { dg-options "-std=gnu++0x" }
|
||||
// { 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
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
|
@ -26,13 +26,7 @@ void test01()
|
|||
{
|
||||
std::function<void()> f1;
|
||||
std::function<void()> f2;
|
||||
f1 == f2; // { dg-error "deleted" }
|
||||
f1 != f2; // { dg-error "deleted" }
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
test01();
|
||||
|
||||
return 0;
|
||||
f1 == f2; // { dg-error "no match" }
|
||||
f1 != f2; // { dg-error "no match" }
|
||||
}
|
||||
// { dg-excess-errors "candidates are" }
|
||||
|
|
Loading…
Reference in New Issue