commit eb92dc0b09262ed29149bf4faaa74a38df738cec
author Benjamin Kramer <benny.kra@googlemail.com> Tue Mar 16 14:14:31 2010 +0000
committer Benjamin Kramer <benny.kra@googlemail.com> Tue Mar 16 14:14:31 2010 +0000
tree 89b03c6567597b8a33fba0e7e446cd55fe674d9a
parent 0eb690390d35371c791d4076bdac973643f0de41

Let SourceManager::getBufferData return StringRef instead of a pair of two const char*.

llvm-svn: 98630

clang/lib/Basic/SourceManager.cpp

diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp
index 6335504..4007ccf 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -474,8 +474,7 @@
   return false;
 }
 
-std::pair<const char*, const char*>
-SourceManager::getBufferData(FileID FID, bool *Invalid) const {
+llvm::StringRef SourceManager::getBufferData(FileID FID, bool *Invalid) const {
   if (Invalid)
     *Invalid = false;
   
@@ -483,10 +482,9 @@
   if (!Buf) {
     if (*Invalid)
       *Invalid = true;
-    const char *FakeText = "";
-    return std::make_pair(FakeText, FakeText + strlen(FakeText));
+    return "";
   }
-  return std::make_pair(Buf->getBufferStart(), Buf->getBufferEnd());
+  return Buf->getBuffer();
 }
 
 //===----------------------------------------------------------------------===//