Skip to content

fix some cases #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2015
Merged

fix some cases #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/ClangImporter/ClangImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
invocationArgStrs.push_back("-Xclang");
invocationArgStrs.push_back("-nostdsysteminc");
} else {
// On Darwin, clang uses -isysroot to specify the include
// On Darwin, Clang uses -isysroot to specify the include
// system root. On other targets, it seems to use --sysroot.
if (triple.isOSDarwin()) {
invocationArgStrs.push_back("-isysroot");
Expand Down Expand Up @@ -745,7 +745,7 @@ bool ClangImporter::Implementation::importHeader(
pp.EndSourceFile();
bumpGeneration();

// Wrap all clang imports under a swift import decl.
// Wrap all Clang imports under a Swift import decl.
for (auto &Import : BridgeHeaderTopLevelImports) {
if (auto *ClangImport = Import.dyn_cast<clang::ImportDecl*>()) {
Import = createImportDecl(SwiftContext, adapter, ClangImport, {});
Expand Down Expand Up @@ -2165,7 +2165,7 @@ void ClangImporter::lookupValue(Identifier name, VisibleDeclConsumer &consumer){

// If we *still* haven't found anything, try looking for '<name>Ref'.
// Eventually, this should be optimized by recognizing this case when
// generating the clang module.
// generating the Clang module.
if (!FoundAny && clangIDToLookup) {
llvm::SmallString<128> buffer;
buffer += clangIDToLookup->getName();
Expand Down