From: Martin Liska <mliska@suse.cz>
Date: Thu, 18 May 2017 14:22:01 +0000 (+0200)
Subject: Define CONSTEXPR macro and use it in vec.h.
X-Git-Tag: upstream/12.2.0~39398
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=671d5bcb262855ea7193f8349f38a15c388fcb6f;p=platform%2Fupstream%2Fgcc.git

Define CONSTEXPR macro and use it in vec.h.

2017-05-18  Martin Liska  <mliska@suse.cz>

	* ansidecl.h: Define CONSTEXPR macro.
2017-05-18  Martin Liska  <mliska@suse.cz>

	* vec.h (struct vnull): Use it.

From-SVN: r248205
---

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;
 
diff --git a/include/ChangeLog b/include/ChangeLog
index 9571a46..9b7a139 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-18  Martin Liska  <mliska@suse.cz>
+
+	* ansidecl.h: Define CONSTEXPR macro.
+
 2017-04-04  Jonathan Wakely  <jwakely@redhat.com>
 
 	* ansidecl.h (ATTRIBUTE_PACKED): Fix typo in comment.
diff --git a/include/ansidecl.h b/include/ansidecl.h
index 25f33da..f6e1761 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -313,6 +313,12 @@ So instead we use the macro below and test it against specific values.  */
 #define ENUM_BITFIELD(TYPE) unsigned int
 #endif
 
+#if __cpp_constexpr >= 200704
+#define CONSTEXPR constexpr
+#else
+#define CONSTEXPR
+#endif
+
 /* C++11 adds the ability to add "override" after an implementation of a
    virtual function in a subclass, to:
      (A) document that this is an override of a virtual function