From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 23 Sep 2016 16:57:23 +0000 (+0200)
Subject: vec.h (vnull::operator vec): Add constexpr keyword for C++11 and later.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d1ba08f49b0ccf9caba669564190f6b5afc7b6f;p=gcc.git

vec.h (vnull::operator vec): Add constexpr keyword for C++11 and later.

	* vec.h (vnull::operator vec): Add constexpr keyword for
	C++11 and later.

From-SVN: r240443
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 023c1722d3e..919b9d8693b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* vec.h (vnull::operator vec): Add constexpr keyword for
+	C++11 and later.
+
 2016-09-23  Doug Gilmore  <doug.gilmore@imgtec.com>
 
 	PR tree-optimization/77654
diff --git a/gcc/vec.h b/gcc/vec.h
index eb8c27024f4..959871bcc1e 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -414,6 +414,9 @@ 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>(); }
 };
 extern vnull vNULL;