summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2016-09-23 16:57:23 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2016-09-23 16:57:23 +0000
commit24b538e15411729d0e7b266907d1a6c519a08103 (patch)
tree3318a8c29f4dbd8fb20143ddbe708cee00468810
parenta30e370d16b0b08169cb4c4b009e767cb2e63aae (diff)
downloadgcc-24b538e15411729d0e7b266907d1a6c519a08103.tar.gz
* vec.h (vnull::operator vec): Add constexpr keyword for
C++11 and later. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@240443 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/vec.h3
2 files changed, 8 insertions, 0 deletions
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;