2 files changed, 6 insertions, 14 deletions
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
index 1af044e00e2..67b5c4f7088 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
@@ -69,10 +69,11 @@ OperatingSystemPython::CreateInstance (Process *process, bool force)
 }
 
 
-const char *
+ConstString
 OperatingSystemPython::GetPluginNameStatic()
 {
-    return "python";
+    static ConstString g_name("python");
+    return g_name;
 }
 
 const char *
@@ -152,15 +153,9 @@ OperatingSystemPython::GetDynamicRegisterInfo ()
 //------------------------------------------------------------------
 // PluginInterface protocol
 //------------------------------------------------------------------
-const char *
+ConstString
 OperatingSystemPython::GetPluginName()
 {
-    return "OperatingSystemPython";
-}
-
-const char *
-OperatingSystemPython::GetShortPluginName()
-{
     return GetPluginNameStatic();
 }
 
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
index 0055058192c..077039e50d5 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
@@ -34,7 +34,7 @@ public:
     static void
     Terminate();
     
-    static const char *
+    static lldb_private::ConstString
     GetPluginNameStatic();
     
     static const char *
@@ -52,12 +52,9 @@ public:
     //------------------------------------------------------------------
     // lldb_private::PluginInterface Methods
     //------------------------------------------------------------------
-    virtual const char *
+    virtual lldb_private::ConstString
     GetPluginName();
     
-    virtual const char *
-    GetShortPluginName();
-    
     virtual uint32_t
     GetPluginVersion();