diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/functional | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6b4444aa2c5..69ec7fff36d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -7,6 +7,10 @@ * include/std/atomic (atomic): Add assertion for trivially copyable. * testsuite/29_atomics/atomic/60695.cc: Adjust line number. + PR libstdc++/61909 + * include/std/functional (__is_location_invariant): Treat all + trivially copyable types as location invariant. + 2014-10-09 Ville Voutilainen <ville.voutilainen@gmail.com> PR libstdc++/60132 diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 15247bf41d9..bed1eea018f 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1743,11 +1743,12 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) /** * Trait identifying "location-invariant" types, meaning that the * address of the object (or any of its members) will not escape. - * Also implies a trivial copy constructor and assignment operator. + * Trivially copyable types are location-invariant and users can + * specialize this trait for other types. */ template<typename _Tp> struct __is_location_invariant - : __or_<is_pointer<_Tp>, is_member_pointer<_Tp>>::type + : is_trivially_copyable<_Tp>::type { }; class _Undefined_class; |