diff options
| author | Jose <jose@zeroc.com> | 2013-07-31 18:42:40 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2013-07-31 18:42:40 +0200 |
| commit | 2391dbfcca87486c5809b6e7bce00541bd1d5d80 (patch) | |
| tree | 6ee7fbe6bf87e6b1404ec13305cac93a72816066 /cpp/src/slice2cpp/Gen.h | |
| parent | ICE-5330 - reset "/dev/urandom" state at fork. (diff) | |
| download | ice-2391dbfcca87486c5809b6e7bce00541bd1d5d80.tar.bz2 ice-2391dbfcca87486c5809b6e7bce00541bd1d5d80.tar.xz ice-2391dbfcca87486c5809b6e7bce00541bd1d5d80.zip | |
Fixed ICE-5395 - invalid code generated with ["cpp:virtual"]
Diffstat (limited to 'cpp/src/slice2cpp/Gen.h')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index cadd15695e5..00fa629a0e8 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -257,7 +257,7 @@ private: void emitGCFunctions(const ClassDefPtr&); void emitGCInsertCode(const TypePtr&, const std::string&, const std::string&, int); void emitGCClearCode(const TypePtr&, const std::string&, const std::string&, int); - bool emitVirtualBaseInitializers(const ClassDefPtr&, bool virtualInheritance); + bool emitVirtualBaseInitializers(const ClassDefPtr&, bool virtualInheritance, bool direct); void emitOneShotConstructor(const ClassDefPtr&); void emitUpcall(const ClassDefPtr&, const std::string&); |