commit aa816b8f3bcd2475afddbaef591042eddcf9ab1e
author Jim Ingham <jingham@apple.com> Wed Sep 02 01:59:14 2015 +0000
committer Jim Ingham <jingham@apple.com> Wed Sep 02 01:59:14 2015 +0000
tree 46ffbc5e427cc5a5d78ca933bb6436ff04bf626c
parent b5c2fd72571203df453b873c26b4a027af44d5b1

Move more functionality from the LanguageRuntimes to the Languages.

llvm-svn: 246616

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index 752569f..7637e43 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -54,8 +54,8 @@
 #include "lldb/Symbol/SymbolVendor.h"
 #include "lldb/Symbol/VariableList.h"
 
-#include "lldb/Target/ObjCLanguageRuntime.h"
-#include "lldb/Target/CPPLanguageRuntime.h"
+#include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h"
+#include "Plugins/Language/ObjC/ObjCLanguage.h"
 
 #include "lldb/Target/Language.h"
 
@@ -2102,7 +2102,7 @@
             llvm::StringRef basename;
             llvm::StringRef context;
 
-            if (!CPPLanguageRuntime::ExtractContextAndIdentifier(name_cstr, context, basename))
+            if (!CPlusPlusLanguage::ExtractContextAndIdentifier(name_cstr, context, basename))
                 basename = name_cstr;
 
             m_apple_names_ap->FindByName (basename.data(), die_offsets);
@@ -2531,7 +2531,7 @@
                     if (die)
                     {
                         const char *die_name = die.GetName();
-                        if (ObjCLanguageRuntime::IsPossibleObjCMethodName(die_name))
+                        if (ObjCLanguage::IsPossibleObjCMethodName(die_name))
                         {
                             if (resolved_dies.find(die.GetDIE()) == resolved_dies.end())
                             {