diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2006-05-16 18:10:14 +0000 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2006-05-16 18:10:14 +0000 |
commit | b8904573ab888241c737a549acb2cdc01fa71cea (patch) | |
tree | cf74c2980db6fb3028fd5266c232fa119de87bd7 /cpp/src/slice2cppe/Gen.cpp | |
parent | Added string converter demo (diff) | |
download | ice-b8904573ab888241c737a549acb2cdc01fa71cea.tar.bz2 ice-b8904573ab888241c737a549acb2cdc01fa71cea.tar.xz ice-b8904573ab888241c737a549acb2cdc01fa71cea.zip |
Fixed bug 997
Diffstat (limited to 'cpp/src/slice2cppe/Gen.cpp')
-rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index 6662a3585c0..a7d2dd6e052 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -2360,7 +2360,18 @@ Slice::Gen::ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& p) } upcall += ")"; + C.zeroIndent(); + C << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; + C.restoreIndent(); C << nl << fixKwd(p->name()) << upcall; + C.zeroIndent(); + C << nl << "#else"; + C.restoreIndent(); + C << nl << fixKwd(p->scoped()) << upcall; + C.zeroIndent(); + C << nl << "#endif"; + C << nl; + C.restoreIndent(); return true; } |