commit 8afa6deb1d1e5a690f7746bfe686f48d20335f97
author Chris Lattner <sabre@nondot.org> Sun Nov 21 09:55:08 2010 +0000
committer Chris Lattner <sabre@nondot.org> Sun Nov 21 09:55:08 2010 +0000
tree 98149801092b901695783c56f379650efc7766d2
parent 0c0e80408a38a0897d5a6ab04b18ac3220b74112

remove old compatibility APIs, use StringRef versions instead.

llvm-svn: 119935

clang/lib/Lex/HeaderSearch.cpp

diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp
index 5a11652..ee6c4c6 100644
--- a/clang/lib/Lex/HeaderSearch.cpp
+++ b/clang/lib/Lex/HeaderSearch.cpp
@@ -119,8 +119,7 @@
     TmpDir += getDir()->getName();
     TmpDir.push_back('/');
     TmpDir.append(Filename.begin(), Filename.end());
-    return HS.getFileMgr().getFile(TmpDir.begin(), TmpDir.end(),
-                                   HS.getFileSystemOpts());
+    return HS.getFileMgr().getFile(TmpDir.str(), HS.getFileSystemOpts());
   }
 
   if (isFramework())
@@ -187,8 +186,7 @@
 
   FrameworkName += "Headers/";
   FrameworkName.append(Filename.begin()+SlashPos+1, Filename.end());
-  if (const FileEntry *FE = FileMgr.getFile(FrameworkName.begin(),
-                                            FrameworkName.end(),
+  if (const FileEntry *FE = FileMgr.getFile(FrameworkName.str(),
                                             FileSystemOpts)) {
     return FE;
   }
@@ -197,8 +195,7 @@
   const char *Private = "Private";
   FrameworkName.insert(FrameworkName.begin()+OrigSize, Private,
                        Private+strlen(Private));
-  return FileMgr.getFile(FrameworkName.begin(), FrameworkName.end(),
-                         FileSystemOpts);
+  return FileMgr.getFile(FrameworkName.str(), FileSystemOpts);
 }
 
 
@@ -335,7 +332,7 @@
   FrameworkName += ".framework/";
 
   llvm::StringMapEntry<const DirectoryEntry *> &CacheLookup =
-    FrameworkMap.GetOrCreateValue(Filename.begin(), Filename.begin()+SlashPos);
+    FrameworkMap.GetOrCreateValue(Filename.substr(0, SlashPos));
 
   // Some other location?
   if (CacheLookup.getValue() &&
@@ -349,8 +346,7 @@
     ++NumSubFrameworkLookups;
 
     // If the framework dir doesn't exist, we fail.
-    const DirectoryEntry *Dir = FileMgr.getDirectory(FrameworkName.begin(),
-                                                     FrameworkName.end(),
+    const DirectoryEntry *Dir = FileMgr.getDirectory(FrameworkName.str(),
                                                      FileSystemOpts);
     if (Dir == 0) return 0;
 
@@ -365,15 +361,13 @@
   llvm::SmallString<1024> HeadersFilename(FrameworkName);
   HeadersFilename += "Headers/";
   HeadersFilename.append(Filename.begin()+SlashPos+1, Filename.end());
-  if (!(FE = FileMgr.getFile(HeadersFilename.begin(),
-                             HeadersFilename.end(), FileSystemOpts))) {
+  if (!(FE = FileMgr.getFile(HeadersFilename.str(), FileSystemOpts))) {
 
     // Check ".../Frameworks/HIToolbox.framework/PrivateHeaders/HIToolbox.h"
     HeadersFilename = FrameworkName;
     HeadersFilename += "PrivateHeaders/";
     HeadersFilename.append(Filename.begin()+SlashPos+1, Filename.end());
-    if (!(FE = FileMgr.getFile(HeadersFilename.begin(), HeadersFilename.end(),
-                               FileSystemOpts)))
+    if (!(FE = FileMgr.getFile(HeadersFilename.str(), FileSystemOpts)))
       return 0;
   }