Skip to content

Commit 75b82ae

Browse files
authored
embind- Fix tsgen failure from merge. (#21320)
Forgot to pull in the upstream branch before updating this test.
1 parent 52e5687 commit 75b82ae

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

test/other/embind_tsgen_ignore_1.d.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,16 @@ export interface IntVec {
4040
push_back(_0: number): void;
4141
resize(_0: number, _1: number): void;
4242
size(): number;
43+
get(_0: number): number | undefined;
4344
set(_0: number, _1: number): boolean;
44-
get(_0: number): any;
45+
delete(): void;
46+
}
47+
48+
export interface MapIntInt {
49+
keys(): IntVec;
50+
get(_0: number): number | undefined;
51+
set(_0: number, _1: number): void;
52+
size(): number;
4553
delete(): void;
4654
}
4755

@@ -91,6 +99,7 @@ interface EmbindModule {
9199
EmptyEnum: {};
92100
enum_returning_fn(): Bar;
93101
IntVec: {new(): IntVec};
102+
MapIntInt: {new(): MapIntInt};
94103
Foo: {};
95104
ClassWithConstructor: {new(_0: number, _1: ValArr): ClassWithConstructor};
96105
ClassWithTwoConstructors: {new(): ClassWithTwoConstructors; new(_0: number): ClassWithTwoConstructors};
@@ -99,8 +108,8 @@ interface EmbindModule {
99108
DerivedClass: {};
100109
a_bool: boolean;
101110
an_int: number;
102-
global_fn(_0: number, _1: number): number;
103111
optional_test(_0: Foo | undefined): number | undefined;
112+
global_fn(_0: number, _1: number): number;
104113
smart_ptr_function(_0: ClassWithSmartPtrConstructor): number;
105114
smart_ptr_function_with_params(foo: ClassWithSmartPtrConstructor): number;
106115
function_with_callback_param(_0: (message: string) => void): number;

test/other/embind_tsgen_ignore_2.d.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,16 @@ export interface IntVec {
3232
push_back(_0: number): void;
3333
resize(_0: number, _1: number): void;
3434
size(): number;
35+
get(_0: number): number | undefined;
3536
set(_0: number, _1: number): boolean;
36-
get(_0: number): any;
37+
delete(): void;
38+
}
39+
40+
export interface MapIntInt {
41+
keys(): IntVec;
42+
get(_0: number): number | undefined;
43+
set(_0: number, _1: number): void;
44+
size(): number;
3745
delete(): void;
3846
}
3947

@@ -83,6 +91,7 @@ interface EmbindModule {
8391
EmptyEnum: {};
8492
enum_returning_fn(): Bar;
8593
IntVec: {new(): IntVec};
94+
MapIntInt: {new(): MapIntInt};
8695
Foo: {};
8796
ClassWithConstructor: {new(_0: number, _1: ValArr): ClassWithConstructor};
8897
ClassWithTwoConstructors: {new(): ClassWithTwoConstructors; new(_0: number): ClassWithTwoConstructors};
@@ -91,8 +100,8 @@ interface EmbindModule {
91100
DerivedClass: {};
92101
a_bool: boolean;
93102
an_int: number;
94-
global_fn(_0: number, _1: number): number;
95103
optional_test(_0: Foo | undefined): number | undefined;
104+
global_fn(_0: number, _1: number): number;
96105
smart_ptr_function(_0: ClassWithSmartPtrConstructor): number;
97106
smart_ptr_function_with_params(foo: ClassWithSmartPtrConstructor): number;
98107
function_with_callback_param(_0: (message: string) => void): number;

0 commit comments

Comments
 (0)