Skip to content

Commit 36d40b1

Browse files
authored
Merge pull request #39643 from guitard0g/fix-template-interop-test
[cxx-interop] Fix a failing template import test for Windows
2 parents 0612364 + 4758e65 commit 36d40b1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

test/Interop/Cxx/templates/Inputs/template-type-parameter-not-in-signature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ template <typename T, typename U>
1111
U multiTemplateTypeParamOneUsedInSignature(U u) { return u; }
1212

1313
template <typename T, typename U>
14-
void multiTemplateTypeParamNotUsedInSignatureWithUnrelatedParams(int x, long y) {}
14+
void multiTemplateTypeParamNotUsedInSignatureWithUnrelatedParams(int x, int y) {}
1515

1616
template <typename T>
1717
T templateTypeParamUsedInReturnType(int x) { return x; }

test/Interop/Cxx/templates/template-type-parameter-not-in-signature-module-interface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// CHECK: func templateTypeParamNotUsedInSignature<T>(T: T.Type)
44
// CHECK: func multiTemplateTypeParamNotUsedInSignature<T, U>(T: T.Type, U: U.Type)
55
// CHECK: func multiTemplateTypeParamOneUsedInSignature<T, U>(_ u: U, T: T.Type) -> U
6-
// CHECK: func multiTemplateTypeParamNotUsedInSignatureWithUnrelatedParams<T, U>(_ x: Int32, _ y: Int, T: T.Type, U: U.Type)
6+
// CHECK: func multiTemplateTypeParamNotUsedInSignatureWithUnrelatedParams<T, U>(_ x: Int32, _ y: Int32, T: T.Type, U: U.Type)
77
// CHECK: func templateTypeParamUsedInReturnType<T>(_ x: Int32) -> T
88
// CHECK: func templateTypeParamUsedInReferenceParam<T>(_ t: UnsafeMutablePointer<T>) -> T
99
// CHECK: @available(*, unavailable, message: "Variadic function is unavailable")

0 commit comments

Comments
 (0)