Re: [PATCH 21/36] opcodes/microblaze: Rename 'or', 'and', 'xor' to avoid C++ conflict

Michael Eager
2015-02-10T15:05:55Z

On 02/09/15 15:20, Pedro Alves wrote:
> Building GDB as a C++ program, we see:
>
> In file included from gdb/microblaze-tdep.c:37:0:
> gdb/../opcodes/../opcodes/microblaze-opcm.h: At global scope:
> gdb/../opcodes/../opcodes/microblaze-opcm.h:32:51: error: expected identifier before ‘or’ token
> ncget, ncput, muli, bslli, bsrai, bsrli, mului, or, and, xor,
> ^
> gdb/../opcodes/../opcodes/microblaze-opcm.h:32:51: error: expected ‘}’ before ‘or’ token
> gdb/../opcodes/../opcodes/microblaze-opcm.h:32:51: error: expected unqualified-id before ‘or’ token
> gdb/../opcodes/../opcodes/microblaze-opcm.h:60:1: error: expected declaration before ‘}’ token
> };
> ^
>
> opcodes/ChangeLog:
> 2015-10-20 Pedro Alves <palves@redhat.com>
> Tom Tromey <tromey@redhat.com>
>
> * microblaze-opcm.h (or, and, xor): Rename to microblaze_or,
> microblaze_and, microblaze_xor.
> * microblaze-opc.h (struct op_code_struct): Adjust.

OK.

--
Michael Eager eager@eagercon.com
1960 Park Blvd., Palo Alto, CA 94306 650-325-8077