diff options
| author | Jose <jose@zeroc.com> | 2015-09-21 17:40:50 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-09-21 17:40:50 +0200 |
| commit | aab3ae3aaef1ca00f8e347d97230c6a54b3bf1d7 (patch) | |
| tree | a7ee147f593f05cc1845c9639c19e60f09c7fb22 /cpp/src/slice2js | |
| parent | Travis CI Updates (diff) | |
| download | ice-aab3ae3aaef1ca00f8e347d97230c6a54b3bf1d7.tar.bz2 ice-aab3ae3aaef1ca00f8e347d97230c6a54b3bf1d7.tar.xz ice-aab3ae3aaef1ca00f8e347d97230c6a54b3bf1d7.zip | |
ICE-6634 - Using Ice in background worker.
Diffstat (limited to 'cpp/src/slice2js')
| -rw-r--r-- | cpp/src/slice2js/Gen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index a7fdc7913b2..d547cc8e3af 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -179,7 +179,7 @@ Slice::JsVisitor::writeMarshalDataMembers(const DataMemberList& dataMembers, con writeMarshalUnmarshalCode(_out, (*q)->type(), "this." + fixId((*q)->name()), true); } } - + for(DataMemberList::const_iterator q = optionalMembers.begin(); q != optionalMembers.end(); ++q) { writeOptionalMarshalUnmarshalCode(_out, (*q)->type(), "this." + fixId((*q)->name()), (*q)->tag(), true); @@ -205,7 +205,7 @@ Slice::JsVisitor::writeUnmarshalDataMembers(const DataMemberList& dataMembers, c writeMarshalUnmarshalCode(_out, (*q)->type(), "this." + fixId((*q)->name()), false); } } - + for(DataMemberList::const_iterator q = optionalMembers.begin(); q != optionalMembers.end(); ++q) { writeOptionalMarshalUnmarshalCode(_out, (*q)->type(), "this." + fixId((*q)->name()), (*q)->tag(), false); @@ -723,8 +723,8 @@ Slice::Gen::generate(const UnitPtr& p) _out << eb; _out << nl << "(typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? module : undefined," - << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require : window.Ice.__require," - << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports : window));"; + << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? require : this.Ice.__require," + << nl << " typeof(global) !== \"undefined\" && typeof(global.process) !== \"undefined\" ? exports : this));"; if(icejs) { |