1 files changed, 24 insertions, 24 deletions

diff --git a/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
index d107ca6bc702..893f43f19977 100644
--- a/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
+++ b/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
@@ -94,20 +94,20 @@ public:
         return false;
     }
 
-    virtual lldb_private::ConstString
-    GetPluginName()
+    lldb_private::ConstString
+    GetPluginName() override
     {
         return GetPluginNameStatic();
     }
 
-    virtual uint32_t
-    GetPluginVersion()
+    uint32_t
+    GetPluginVersion()  override
     {
         return 1;
     }
 
     bool
-    SetTargetTriple (const ArchSpec &arch);
+    SetTargetTriple (const ArchSpec &arch)  override;
     
     enum Mode
     {
@@ -148,8 +148,8 @@ public:
 //    {
 //    }
     
-    virtual bool
-    SupportsEmulatingInstructionsOfType (InstructionType inst_type)
+    bool
+    SupportsEmulatingInstructionsOfType (InstructionType inst_type)  override
     {
         return SupportsEmulatingInstructionsOfTypeStatic (inst_type);
     }
@@ -157,32 +157,32 @@ public:
     virtual bool
     SetArchitecture (const ArchSpec &arch);
 
-    virtual bool 
-    ReadInstruction ();
+    bool
+    ReadInstruction ()  override;
     
-    virtual bool
-    SetInstruction (const Opcode &insn_opcode, const Address &inst_addr, Target *target);
+    bool
+    SetInstruction (const Opcode &insn_opcode, const Address &inst_addr, Target *target)  override;
 
-    virtual bool
-    EvaluateInstruction (uint32_t evaluate_options);
-    
-    virtual bool
-    TestEmulation (Stream *out_stream, ArchSpec &arch, OptionValueDictionary *test_data);
+    bool
+    EvaluateInstruction (uint32_t evaluate_options) override;
 
-    virtual bool
-    GetRegisterInfo (lldb::RegisterKind reg_kind, uint32_t reg_num, RegisterInfo &reg_info);
-    
+    bool
+    IsInstructionConditional() override;
 
-    virtual bool
-    CreateFunctionEntryUnwind (UnwindPlan &unwind_plan);
+    bool
+    TestEmulation (Stream *out_stream, ArchSpec &arch, OptionValueDictionary *test_data)  override;
+
+    bool
+    GetRegisterInfo (lldb::RegisterKind reg_kind, uint32_t reg_num, RegisterInfo &reg_info)  override;
+
+    bool
+    CreateFunctionEntryUnwind (UnwindPlan &unwind_plan) override;
 
     uint32_t
     ArchVersion();
 
     bool
-    ConditionPassed (const uint32_t opcode, 
-                     bool *is_conditional = NULL);  // Filled in with true if the opcode is a conditional opcode
-                                                    // Filled in with false if the opcode is always executed
+    ConditionPassed (const uint32_t opcode);
 
     uint32_t
     CurrentCond (const uint32_t opcode);