1 files changed, 3 insertions, 8 deletions
diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
index 8c7cb3685f3..b926dc0deb4 100644
--- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
+++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
@@ -11,6 +11,7 @@
 #define lldb_EmulateInstructionARM_h_
 
 #include "lldb/Core/EmulateInstruction.h"
+#include "lldb/Core/ConstString.h"
 #include "lldb/Core/Error.h"
 #include "Plugins/Process/Utility/ARMDefines.h"
 
@@ -67,7 +68,7 @@ public:
     static void
     Terminate ();
 
-    static const char *
+    static lldb_private::ConstString
     GetPluginNameStatic ();
     
     static const char *
@@ -93,15 +94,9 @@ public:
         return false;
     }
 
-    virtual const char *
+    virtual lldb_private::ConstString
     GetPluginName()
     {
-        return "EmulateInstructionARM";
-    }
-
-    virtual const char *
-    GetShortPluginName()
-    {
         return GetPluginNameStatic();
     }