From c9afb226051b44e05138ccad825099f8259ec3f6 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 20 May 2019 18:00:46 +0000 Subject: [PATCH] cp-tree.h: Remove remnants of CONV_NONCONVERTING. 2019-05-20 Paolo Carlini * cp-tree.h: Remove remnants of CONV_NONCONVERTING. From-SVN: r271428 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/cp-tree.h | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 75236fb2968..0c284d4591f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2019-05-20 Paolo Carlini + + * cp-tree.h: Remove remnants of CONV_NONCONVERTING. + 2019-05-20 Nathan Sidwell * name-lookup.c (finish_namespace_using_directive) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 0e45ac6081b..45a6a7010f6 100644 --- 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 \ -- 2.30.2