diff options
Diffstat (limited to 'lib/Lex')
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 4 | ||||
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index ca8693bf61..331424bdc8 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -1049,8 +1049,8 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok, FilenameBuffer.push_back('<'); if (ConcatenateIncludeName(FilenameBuffer, *this)) return; // Found <eom> but no ">"? Diagnostic already emitted. - FilenameStart = &FilenameBuffer[0]; - FilenameEnd = &FilenameBuffer[FilenameBuffer.size()]; + FilenameStart = FilenameBuffer.data(); + FilenameEnd = FilenameStart + FilenameBuffer.size(); break; default: Diag(FilenameTok.getLocation(), diag::err_pp_expects_filename); diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 18dcfb25e7..55222c944a 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -439,7 +439,8 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, return 0; } - return MacroArgs::create(MI, &ArgTokens[0], ArgTokens.size(),isVarargsElided); + return MacroArgs::create(MI, ArgTokens.data(), ArgTokens.size(), + isVarargsElided); } /// ComputeDATE_TIME - Compute the current time, enter it into the specified |