* include/std/functional (__is_location_invariant): Use __or_ helper.

From-SVN: r209445
This commit is contained in:
Jonathan Wakely 2014-04-16 18:46:13 +01:00 committed by Jonathan Wakely
parent 23b0af0aa0
commit 6e2d247b1e
2 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2014-04-16 Jonathan Wakely <jwakely@redhat.com>
* include/std/functional (__is_location_invariant): Use __or_ helper.
2014-04-15 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/60734

View File

@ -1747,8 +1747,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
*/
template<typename _Tp>
struct __is_location_invariant
: integral_constant<bool, (is_pointer<_Tp>::value
|| is_member_pointer<_Tp>::value)>
: __or_<is_pointer<_Tp>, is_member_pointer<_Tp>>::type
{ };
class _Undefined_class;