[Bug libstdc++/68995] [4.9/5/6 Regression] Including both and can cause ADL problems in std::function SFINAE

[redi at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68995

--- Comment #6 from Jonathan Wakely <redi at gcc dot gnu.org> ---
Author: redi
Date: Tue Jan 12 18:11:20 2016
New Revision: 232288

URL: https://gcc.gnu.org/viewcvs?rev=232288&root=gcc&view=rev
Log:
libstdc++/68995 qualify calls to __callable_functor

        PR libstdc++/68995
        * include/std/functional (_Function_handler::_M_invoke): Qualify
        __callable_functor.
        * testsuite/20_util/function/68995.cc: New.

Added:
    branches/gcc-4_9-branch/libstdc++-v3/testsuite/20_util/function/68995.cc
Modified:
    branches/gcc-4_9-branch/libstdc++-v3/ChangeLog
    branches/gcc-4_9-branch/libstdc++-v3/include/std/functional