Skip to content

Commit 848d823

Browse files
authored
[cxx-interop] Cleanup a test now that we can import constructors (#34460)
1 parent b6e07a9 commit 848d823

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

test/Interop/Cxx/static/Inputs/static-var.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static constexpr int staticConstexpr = makeStaticConstexpr();
2424

2525
class NonTrivial {
2626
public:
27-
explicit NonTrivial() : val(-1) {}
2827
explicit NonTrivial(int val) : val(val) {}
2928
constexpr NonTrivial(int val, int val2) : val(val + val2) {}
3029
int val;

test/Interop/Cxx/static/static-var.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ StaticVarTestSuite.test("static-non-trivial-write-from-cxx") {
6767

6868
StaticVarTestSuite.test("static-non-trivial-write-from-swift") {
6969
expectNotEqual(1026, staticNonTrivial.val)
70-
//TODO: Delete `NonTrivial()` adn use `NonTrivial(int)` constructor once
71-
// apple/swift/pull/30630 is merged.
72-
staticNonTrivial = NonTrivial()
73-
staticNonTrivial.val = 1026
70+
staticNonTrivial = NonTrivial(1026)
7471
expectEqual(1026, getstaticNonTrivialFromCxx().pointee.val)
7572
}
7673

0 commit comments

Comments
 (0)