diff options
author | Chad Austin <chad@imvu.com> | 2014-05-08 14:08:39 -0700 |
---|---|---|
committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2014-05-21 22:58:38 +0700 |
commit | 416a5a9715928eb56770bf1f60d735c80ea07155 (patch) | |
tree | 26eb5704f8817ab9bb406c59fd25706a427d7b9d /src/embind/embind.js | |
parent | 9759bdbc104d860e8eadbb0f35e0d3dedb48035d (diff) |
Rename initialize to __construct to avoid conflicting with C++ function names
Diffstat (limited to 'src/embind/embind.js')
-rw-r--r-- | src/embind/embind.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/embind/embind.js b/src/embind/embind.js index 25c3191a..3aa9fef7 100644 --- a/src/embind/embind.js +++ b/src/embind/embind.js @@ -1760,11 +1760,11 @@ function __embind_create_inheriting_constructor(constructorName, wrapperType, pr Object.defineProperty(this, '__parent', { value: wrapperPrototype }); - this.initialize.apply(this, arraySlice.call(arguments)); + this.__construct.apply(this, arraySlice.call(arguments)); }); // It's a little nasty that we're modifying the wrapper prototype here. - wrapperPrototype.initialize = function initialize() { + wrapperPrototype.__construct = function __construct() { var inner = baseConstructor.__$implement.apply( undefined, [this].concat(arraySlice.call(arguments))); |