From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 9 Oct 2014 18:17:28 +0000 (+0000)
Subject: 	PR libstdc++/61909
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9dc0da27e3b082b4d13b6dc7f637fb8b0c7cd2f;p=thirdparty%2Fgcc.git

	PR libstdc++/61909
	* include/std/functional (__is_location_invariant): Treat all
	trivially copyable types as location invariant.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216047 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6b4444aa2c56..69ec7fff36d9 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 15247bf41d92..bed1eea018f6 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;