commit f6ac97b101c8840efa92bf29166077ce4049e293
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 ae3c4bd11598f49ee678e6fba5a3e2df38d24427
parent c506357c3778092c2a3251243f12524e8eb89274

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


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98630 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Rewrite/HTMLRewrite.cpp

diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp
index f325121..7b78070 100644
--- a/lib/Rewrite/HTMLRewrite.cpp
+++ b/lib/Rewrite/HTMLRewrite.cpp
@@ -44,7 +44,7 @@
   EOffset += Lexer::MeasureTokenLength(E, R.getSourceMgr(), R.getLangOpts());
 
   bool Invalid = false;
-  const char *BufferStart = SM.getBufferData(FID, &Invalid).first;
+  const char *BufferStart = SM.getBufferData(FID, &Invalid).data();
   if (Invalid)
     return;
   

lib/Rewrite/Rewriter.cpp

diff --git a/lib/Rewrite/Rewriter.cpp b/lib/Rewrite/Rewriter.cpp
index 9744496..bf8ba70 100644
--- a/lib/Rewrite/Rewriter.cpp
+++ b/lib/Rewrite/Rewriter.cpp
@@ -165,8 +165,8 @@
     return I->second;
   I = RewriteBuffers.insert(I, std::make_pair(FID, RewriteBuffer()));
 
-  std::pair<const char*, const char*> MB = SourceMgr->getBufferData(FID);
-  I->second.Initialize(MB.first, MB.second);
+  llvm::StringRef MB = SourceMgr->getBufferData(FID);
+  I->second.Initialize(MB.begin(), MB.end());
 
   return I->second;
 }