diff options
| author | Nikola Smiljanic <popizdeh@gmail.com> | 2015-05-08 06:02:37 +0000 |
|---|---|---|
| committer | Nikola Smiljanic <popizdeh@gmail.com> | 2015-05-08 06:02:37 +0000 |
| commit | cf385dc8879f05581e94944d8ae7f00138c9ed72 (patch) | |
| tree | c5004761f589ffdcd1e0580b3ecd98b744e263a5 /clang/lib/Lex/HeaderSearch.cpp | |
| parent | fa7525935bd91a4a537d3a7527ec999531536c22 (diff) | |
| download | llvm-cf385dc8879f05581e94944d8ae7f00138c9ed72.zip llvm-cf385dc8879f05581e94944d8ae7f00138c9ed72.tar.gz llvm-cf385dc8879f05581e94944d8ae7f00138c9ed72.tar.bz2 | |
Revert "Fix path separator issue on Windows."
This reverts commit 9242ff16b0460b488691fd70b42a2bf81a531e3a.
llvm-svn: 236806
Diffstat (limited to 'clang/lib/Lex/HeaderSearch.cpp')
| -rw-r--r-- | clang/lib/Lex/HeaderSearch.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index b316cca..04cdb0f 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -614,8 +614,10 @@ const FileEntry *HeaderSearch::LookupFile( const FileEntry *Includer = IncluderAndDir.first; // Concatenate the requested file onto the directory. + // FIXME: Portability. Filename concatenation should be in sys::Path. TmpDir = IncluderAndDir.second->getName(); - llvm::sys::path::append(TmpDir, Filename); + TmpDir.push_back('/'); + TmpDir.append(Filename.begin(), Filename.end()); // FIXME: We don't cache the result of getFileInfo across the call to // getFileAndSuggestModule, because it's a reference to an element of |