opcodes/microblaze: Rename 'or', 'and', 'xor' to avoid C++ conflict
authorPedro Alves <palves@redhat.com>
Tue, 10 Feb 2015 18:09:39 +0000 (18:09 +0000)
committerPedro Alves <palves@redhat.com>
Tue, 10 Feb 2015 18:09:39 +0000 (18:09 +0000)
commit07774fccc3280323f43db9ed204f628503b34663
tree351c908fb95162e9339ed41e4759dd63156f4c60
parentc1cc6152620563bbe861cfc2fa0a796e71ca87b5
opcodes/microblaze: Rename 'or', 'and', 'xor' to avoid C++ conflict

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-02-10  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 (opcodes): Adjust.
opcodes/ChangeLog
opcodes/microblaze-opc.h
opcodes/microblaze-opcm.h