Skip to content

Commit 76c9587

Browse files
committed
If the type is an Array, it can't be self.
1 parent c6c71c3 commit 76c9587

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

generate/input/descriptor.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,7 @@
392392
"cType": "const git_commit **",
393393
"cppClassName": "Array",
394394
"jsClassName": "Array",
395-
"arrayElementCppClassName": "GitCommit",
396-
"isSelf": false
395+
"arrayElementCppClassName": "GitCommit"
397396
},
398397
"update_ref": {
399398
"isOptional": true

generate/scripts/helpers.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,7 @@ var Helpers = {
234234
},
235235

236236
decorateArg: function(arg, allArgs, typeDef, fnDef, argOverrides, enums) {
237-
var type = arg.cType || arg.type;
238-
if (argOverrides) {
239-
type = argOverrides.cType || argOverrides.type || type;
240-
}
241-
237+
var type = argOverrides.cType || argOverrides.type || arg.cType || arg.type;
242238
var normalizedType = Helpers.normalizeCtype(type);
243239

244240
arg.cType = type;
@@ -270,6 +266,8 @@ var Helpers = {
270266
if (typeof arg.isSelf == 'undefined') {
271267
arg.isSelf = utils.isPointer(arg.type) &&
272268
normalizedType == typeDef.cType &&
269+
arg.cppClassName !== "Array" &&
270+
argOverrides.cppClassName !== "Array" &&
273271
_.every(allArgs, function(_arg) { return !_arg.isSelf; });
274272
}
275273

0 commit comments

Comments
 (0)