diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2019-05-20 18:00:46 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2019-05-20 18:00:46 +0000 |
| commit | c9afb226051b44e05138ccad825099f8259ec3f6 (patch) | |
| tree | e22200e3901ee62d5e7fbddd94072d5bd4394fcc /gcc | |
| parent | fb03c52fccd5c8723c3447212c22acfa23459fd0 (diff) | |
| download | gcc-c9afb226051b44e05138ccad825099f8259ec3f6.zip gcc-c9afb226051b44e05138ccad825099f8259ec3f6.tar.gz gcc-c9afb226051b44e05138ccad825099f8259ec3f6.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 75236fb..0c284d4 100644 --- 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 --- 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 \ |