diff options
| author | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
| commit | b9c2a6f6628476f11c78a7de2adc90edca1e209e (patch) | |
| tree | df192d87dfbc594a7a2b52a96b5145ad3156d26f /cpp/src/slice2cpp/Gen.cpp | |
| parent | ICE-6645 Removed hack to keep binary compatibility in Ice 3.6.1 (diff) | |
| parent | Removed ARM configuraton from WinRT testsuite solutions (diff) | |
| download | ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.bz2 ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.xz ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 73bff267ba7..e9e771bf64f 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -3879,7 +3879,6 @@ Slice::Gen::ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& p, boo upcall += ")"; H << nl << fixKwd(p->scoped()) << upcall; - H << nl; return true; } |