From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 16 Apr 2014 17:46:13 +0000 (+0100)
Subject: * include/std/functional (__is_location_invariant): Use __or_ helper.
X-Git-Tag: releases/gcc-5.1.0~8086
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e2d247b1ea790690279bafebdc5efe1369da985;p=thirdparty%2Fgcc.git

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

From-SVN: r209445
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 09dd0f7e0437..4d0e3901a455 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 0e80fa37cf4c..295022de8ee3 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;