diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-07-26 12:46:02 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-26 12:47:51 -0700 |
| commit | 0f055d11096cb02563e9c040cd03c791fd8f69a3 (patch) | |
| tree | 8c7e730f17174ab4e11786fde1c2a05c7039d507 /runtime/dex_instruction.h | |
| parent | 93c3396f8b33539489763ebdfafcedb4127009d9 (diff) | |
| parent | 7934ac288acfb2552bb0b06ec1f61e5820d924a4 (diff) | |
| download | android_art-0f055d11096cb02563e9c040cd03c791fd8f69a3.tar.gz android_art-0f055d11096cb02563e9c040cd03c791fd8f69a3.tar.bz2 android_art-0f055d11096cb02563e9c040cd03c791fd8f69a3.zip | |
resolved conflicts for merge of 7934ac28 to dalvik-dev
Change-Id: I8798a6f154463d3f92f6aca62f14130aec82d273
Diffstat (limited to 'runtime/dex_instruction.h')
| -rw-r--r-- | runtime/dex_instruction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/dex_instruction.h b/runtime/dex_instruction.h index 74789bbad3..13b0f1c270 100644 --- a/runtime/dex_instruction.h +++ b/runtime/dex_instruction.h @@ -82,7 +82,7 @@ class Instruction { // TODO: the code layout below is deliberate to avoid this enum being picked up by // generate-operator-out.py. enum Code - { // NOLINT(whitespace/braces) + { // NOLINT(whitespace/braces) #define INSTRUCTION_ENUM(opcode, cname, p, f, r, i, a, v) cname = opcode, #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_ENUM) @@ -124,7 +124,7 @@ class Instruction { kThrow = 0x08, // could cause an exception to be thrown kReturn = 0x10, // returns, no additional statements kInvoke = 0x20, // a flavor of invoke - kUnconditional = 0x40, // unconditional branch + kUnconditional = 0x40, // unconditional branch }; enum VerifyFlag { |