From eb92dc0b09262ed29149bf4faaa74a38df738cec Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 16 Mar 2010 14:14:31 +0000 Subject: Let SourceManager::getBufferData return StringRef instead of a pair of two const char*. llvm-svn: 98630 --- clang/lib/Basic/SourceManager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'clang/lib/Basic/SourceManager.cpp') diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index 6335504a7dd..4007ccf2a61 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -474,8 +474,7 @@ bool SourceManager::overrideFileContents(const FileEntry *SourceFile, return false; } -std::pair -SourceManager::getBufferData(FileID FID, bool *Invalid) const { +llvm::StringRef SourceManager::getBufferData(FileID FID, bool *Invalid) const { if (Invalid) *Invalid = false; @@ -483,10 +482,9 @@ SourceManager::getBufferData(FileID FID, bool *Invalid) const { 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(); } //===----------------------------------------------------------------------===// -- cgit v1.2.3