diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-06-27 17:54:30 +0200 |
| commit | c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7 (patch) | |
| tree | 5cb64dfe155e5d2349efb6c7dc4b0f5b5284d44a /cpp/src/slice2cpp | |
| parent | Fix Windows php build to restore nuget packages (diff) | |
| download | ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.bz2 ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.tar.xz ice-c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7.zip | |
Refactored SSL and iAP transports, support for running SSL on top
of TCP/iAP/Bluetooth.
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 81c335ad2dc..5fe808581fa 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2527,7 +2527,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) } bool hasBaseClass = !bases.empty() && !bases.front()->isInterface(); - bool override = p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); + bool override = !p->isLocal() && p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); bool hasGCObjectBaseClass = basePreserved || override || preserved; if(!basePreserved && (override || preserved)) { |