aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/vec.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ced722..6ae69c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-18 Martin Liska <mliska@suse.cz>
+
+ * vec.h (struct vnull): Use it.
+
2017-05-18 Jan Hubicka <hubicka@ucw.cz>
* ipa-inline-analysis.c (predicate_conditions): Move to ipa-inline.h
diff --git a/gcc/vec.h b/gcc/vec.h
index 914f89c..755a1f8 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -416,10 +416,7 @@ struct GTY((user)) vec
struct vnull
{
template <typename T, typename A, typename L>
-#if __cpp_constexpr >= 200704
- constexpr
-#endif
- operator vec<T, A, L> () { return vec<T, A, L>(); }
+ CONSTEXPR operator vec<T, A, L> () { return vec<T, A, L>(); }
};
extern vnull vNULL;