averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-04-16 11:08:33 -07:00
parent f34fcf47cd 80defe51b7
commit d2cb1fbee9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/Frontend/FrontendInputsAndOutputs.h
View File

@@ -139,7 +139,7 @@ public:
bool isInputPrimary(StringRef file) const; bool isInputPrimary(StringRef file) const;
unsigned numberOfPrimaryInputsEndingWith(const char *extension) const; unsigned numberOfPrimaryInputsEndingWith(StringRef extension) const;
// Multi-facet readers // Multi-facet readers

2
lib/Frontend/FrontendInputsAndOutputs.cpp
View File

@@ -134,7 +134,7 @@ bool FrontendInputsAndOutputs::isInputPrimary(StringRef file) const {
} }
unsigned FrontendInputsAndOutputs::numberOfPrimaryInputsEndingWith( unsigned FrontendInputsAndOutputs::numberOfPrimaryInputsEndingWith(
const char *extension) const { StringRef extension) const {
unsigned n = 0; unsigned n = 0;
(void)forEachPrimaryInput([&](const InputFile &input) -> bool { (void)forEachPrimaryInput([&](const InputFile &input) -> bool {
if (llvm::sys::path::extension(input.file()).endswith(extension)) if (llvm::sys::path::extension(input.file()).endswith(extension))