diff options
author | dim <dim@FreeBSD.org> | 2013-12-22 00:07:40 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2013-12-22 00:07:40 +0000 |
commit | 952eddef9aff85b1e92626e89baaf7a360e2ac85 (patch) | |
tree | df8df0b0067b381eab470a3b8f28d14a552a6340 /lib/Rewrite/Core/HTMLRewrite.cpp | |
parent | ea266cad53e3d49771fa38103913d3ec7a166694 (diff) | |
download | FreeBSD-src-952eddef9aff85b1e92626e89baaf7a360e2ac85.zip FreeBSD-src-952eddef9aff85b1e92626e89baaf7a360e2ac85.tar.gz |
Vendor import of clang release_34 branch r197841 (effectively, 3.4 RC3):
https://llvm.org/svn/llvm-project/cfe/branches/release_34@197841
Diffstat (limited to 'lib/Rewrite/Core/HTMLRewrite.cpp')
-rw-r--r-- | lib/Rewrite/Core/HTMLRewrite.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Rewrite/Core/HTMLRewrite.cpp b/lib/Rewrite/Core/HTMLRewrite.cpp index 2d279f1..4da00a8 100644 --- a/lib/Rewrite/Core/HTMLRewrite.cpp +++ b/lib/Rewrite/Core/HTMLRewrite.cpp @@ -164,8 +164,7 @@ void html::EscapeText(Rewriter &R, FileID FID, } } -std::string html::EscapeText(const std::string& s, bool EscapeSpaces, - bool ReplaceTabs) { +std::string html::EscapeText(StringRef s, bool EscapeSpaces, bool ReplaceTabs) { unsigned len = s.size(); std::string Str; @@ -361,7 +360,7 @@ void html::SyntaxHighlight(Rewriter &R, FileID FID, const Preprocessor &PP) { const SourceManager &SM = PP.getSourceManager(); const llvm::MemoryBuffer *FromFile = SM.getBuffer(FID); Lexer L(FID, FromFile, SM, PP.getLangOpts()); - const char *BufferStart = L.getBufferStart(); + const char *BufferStart = L.getBuffer().data(); // Inform the preprocessor that we want to retain comments as tokens, so we // can highlight them. |