diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-04-16 18:46:13 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-04-16 18:46:13 +0100 |
| commit | 6e2d247b1ea790690279bafebdc5efe1369da985 (patch) | |
| tree | acb4e51c6ab199b96510528ce7ada4849b0b7f4e | |
| parent | 23b0af0aa08c3253e8a058f940e398c8fbb10be1 (diff) | |
| download | gcc-6e2d247b1ea790690279bafebdc5efe1369da985.zip gcc-6e2d247b1ea790690279bafebdc5efe1369da985.tar.gz gcc-6e2d247b1ea790690279bafebdc5efe1369da985.tar.bz2 | |
* include/std/functional (__is_location_invariant): Use __or_ helper.
From-SVN: r209445
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 09dd0f7..4d0e390 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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 diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 0e80fa3..295022d 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -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; |