From 18a25b648176c70a651dc869394eef2d26d50723 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 17 Sep 2020 23:33:41 +0100 Subject: [PATCH] gdb.base/printcmds.c C++-ify Adjust gdb.base/printcmds.c to make it buildable as a C++ program. gdb/testsuite/ChangeLog: * gdb.base/printcmds.c (three, flag_enum_without_zero) (three_not_flag): Add casts. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/printcmds.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index aee673f162..7b424b509f 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-09-17 Pedro Alves + + * gdb.base/printcmds.c (three, flag_enum_without_zero) + (three_not_flag): Add casts. + 2020-09-17 Pedro Alves * gdb.base/examine-backward.c (Barrier, TestStrings): Now unsigned diff --git a/gdb/testsuite/gdb.base/printcmds.c b/gdb/testsuite/gdb.base/printcmds.c index 04b766fc0c..9af6bf3aac 100644 --- a/gdb/testsuite/gdb.base/printcmds.c +++ b/gdb/testsuite/gdb.base/printcmds.c @@ -108,7 +108,7 @@ enum flag_enum FE_TWO_LEGACY = 0x02, }; -enum flag_enum three = FE_ONE | FE_TWO; +enum flag_enum three = (enum flag_enum) (FE_ONE | FE_TWO); /* Another enum considered as a "flag enum", but with no enumerator with value 0. */ @@ -118,7 +118,7 @@ enum flag_enum_without_zero FEWZ_TWO = 0x02, }; -enum flag_enum_without_zero flag_enum_without_zero = 0; +enum flag_enum_without_zero flag_enum_without_zero = (enum flag_enum_without_zero) 0; /* Not a flag enum, an enumerator value has multiple bits sets. */ enum not_flag_enum @@ -128,7 +128,7 @@ enum not_flag_enum NFE_F0 = 0xf0, }; -enum not_flag_enum three_not_flag = NFE_ONE | NFE_TWO; +enum not_flag_enum three_not_flag = (enum not_flag_enum) (NFE_ONE | NFE_TWO); /* A structure with an embedded array at an offset > 0. The array has all elements with the same repeating value, which must not be the -- 2.34.1