diff options
| author | Jose <jose@zeroc.com> | 2014-06-17 19:09:31 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-06-17 19:09:31 +0200 |
| commit | db7d72e5343b2e03406e5dea9b2d5eb7d5b6385f (patch) | |
| tree | 61e4cc928a04956119a5a423c89d2b25b8e66bba /cpp/src | |
| parent | Fix for ICE-5321: Ice.Config set to empty value (C++, Java, C#) (diff) | |
| download | ice-db7d72e5343b2e03406e5dea9b2d5eb7d5b6385f.tar.bz2 ice-db7d72e5343b2e03406e5dea9b2d5eb7d5b6385f.tar.xz ice-db7d72e5343b2e03406e5dea9b2d5eb7d5b6385f.zip | |
JavaScript nested modules patch
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2js/Gen.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp index a95735661f6..1542b04f8fd 100644 --- a/cpp/src/slice2js/Gen.cpp +++ b/cpp/src/slice2js/Gen.cpp @@ -835,7 +835,7 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p) // // For an inner module we write // - // Foo.Bar = global.Foo ? (global.Foo.Bar || {}) : {}; + // Foo.Bar = Foo.Bar || {}; // const string scoped = getLocalScope(p->scoped()); @@ -850,8 +850,7 @@ Slice::Gen::TypesVisitor::visitModuleStart(const ModulePtr& p) } else { - _out << nl << scoped << " = global." << getLocalScope(p->scope()) << " ? (global." << scoped - << " || {}) : {};"; + _out << nl << scoped << " = " << scoped << " || {};"; } } return true; |