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

From-SVN: r209445

libstdc++-v3/ChangeLog

+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

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;