Skip to content

Commit fc70c7b

Browse files
committed
---
yaml --- r: 348659 b: refs/heads/master c: 628d03b h: refs/heads/master i: 348657: 6c72edf 348655: 1c15f47
1 parent 533eb6d commit fc70c7b

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 004e02b84a522540a095f6edda02e522c587000b
2+
refs/heads/master: 628d03bbab3735f17ad3ea949cc17b6cb897cc9b
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/ClangImporter/ImportDecl.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4696,9 +4696,6 @@ namespace {
46964696
/*TrailingWhere=*/nullptr);
46974697
result->computeType();
46984698

4699-
// FIXME: Kind of awkward that we have to do this here
4700-
result->getGenericParams()->getParams()[0]->setDepth(0);
4701-
47024699
addObjCAttribute(result, Impl.importIdentifier(decl->getIdentifier()));
47034700

47044701
if (declaredNative)

0 commit comments

Comments
 (0)