cp-tree.h: Remove remnants of CONV_NONCONVERTING.

2019-05-20  Paolo Carlini  <paolo.carlini@oracle.com>

	* cp-tree.h: Remove remnants of CONV_NONCONVERTING.

From-SVN: r271428

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 75236fb..0c284d4 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * cp-tree.h: Remove remnants of CONV_NONCONVERTING.
+
 2019-05-20  Nathan Sidwell  <nathan@acm.org>
 
        * name-lookup.c (finish_namespace_using_directive)

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 0e45ac6..45a6a70 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -5503,9 +5503,8 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, TYPENAME_FLAG };
 #define CONV_CONST       4
 #define CONV_REINTERPRET 8
 #define CONV_PRIVATE    16
-/* #define CONV_NONCONVERTING 32 */
-#define CONV_FORCE_TEMP  64
-#define CONV_FOLD       128
+#define CONV_FORCE_TEMP  32
+#define CONV_FOLD       64
 #define CONV_OLD_CONVERT (CONV_IMPLICIT | CONV_STATIC | CONV_CONST \
                          | CONV_REINTERPRET)
 #define CONV_C_CAST      (CONV_IMPLICIT | CONV_STATIC | CONV_CONST \