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

This commit is contained in:
swift-ci
2018-04-16 11:08:33 -07:00
2 changed files with 2 additions and 2 deletions

View File

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

View File

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