averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +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:
Bob Wilson
2017-01-08 17:07:46 -08:00
parent 4bb15659c9 6378079eb8
commit 37e7d1c627
7280 changed files with 13835 additions and 12796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -2,7 +2,7 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
@@ -1313,7 +1313,7 @@ public:
}
public:
void lookupVisibleDecls(ArrayRef<Module *> Modules) {
void lookupVisibleDecls(ArrayRef<ModuleDecl *> Modules) {
for (auto M : Modules) {
llvm::SmallVector<Decl*, 512> Decls;
M->getDisplayDecls(Decls);
@@ -3354,7 +3354,7 @@ static int dumpSwiftModules(const CompilerInvocation &InitInvok,
return 1;
}
std::vector<Module*> Modules;
std::vector<ModuleDecl*> Modules;
CompilerInvocation Invocation(InitInvok);
CompilerInstance CI;
// Display diagnostics to stderr.
@@ -3422,7 +3422,7 @@ static int dumpSDKContent(const CompilerInvocation &InitInvok,
return 1;
}
std::vector<Module *> Modules;
std::vector<ModuleDecl *> Modules;
for (auto &Entry : ModuleNames) {
StringRef Name = Entry.getKey();
if (options::Verbose)