diff options
| author | Marc Laukien <marc@zeroc.com> | 2003-04-04 20:37:11 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2003-04-04 20:37:11 +0000 |
| commit | 5ecd51f857580cd98e226e6f8a75524b6bd239e4 (patch) | |
| tree | fdd01122688a49cde784ae95dab3e84965b45e55 /cpp/src/slice2cpp | |
| parent | Added virtual inheritance from IceUtil::Shared (diff) | |
| download | ice-5ecd51f857580cd98e226e6f8a75524b6bd239e4.tar.bz2 ice-5ecd51f857580cd98e226e6f8a75524b6bd239e4.tar.xz ice-5ecd51f857580cd98e226e6f8a75524b6bd239e4.zip | |
gcc 2.95.3 fixes
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index a4924302bf7..9b64c588518 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2539,7 +2539,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) } writeAllocateCode(C, inParams, 0); writeUnmarshalCode(C, inParams, 0); - C << nl << classScopedAMD << '_' << name << "Ptr __cb = new ::IceAsync" << classScopedAMD << '_' << name + C << nl << classScopedAMD << '_' << name << "Ptr __cb = new IceAsync" << classScopedAMD << '_' << name << "(__in);"; C << nl << "try"; C << sb; @@ -2694,7 +2694,7 @@ Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p) << scoped << "Prx& d)"; C << sb; C << nl << "d = 0;"; - C << nl << "if(b)"; + C << nl << "if(b.get())"; // COMPILERFIX: 'if(b)' doesn't work for GCC 2.95.3. C << sb; C << nl << "d = dynamic_cast< ::IceProxy" << scoped << "*>(b.get());"; C << nl << "if(!d && b->ice_isA(\"" << p->scoped() << "\"))"; @@ -3400,7 +3400,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) H << sp << nl << "typedef ::IceUtil::Handle< " << classScopedAMI << '_' << name << "> " << classNameAMI << '_' << name << "Ptr;"; - C << sp << nl << "void" << nl << classScopedAMI << '_' << name << "::__response(bool __ok)"; + C << sp << nl << "void" << nl << classScopedAMI.substr(2) << '_' << name << "::__response(bool __ok)"; C << sb; writeAllocateCode(C, outParams, ret); C << nl << "try"; @@ -3606,7 +3606,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) H << nl << "virtual void ice_exception();"; H << eb << ';'; - C << sp << nl << "::IceAsync" << classScopedAMD << '_' << name << "::" << classNameAMD << '_' << name + C << sp << nl << "IceAsync" << classScopedAMD << '_' << name << "::" << classNameAMD << '_' << name << "(::IceInternal::Incoming& in) :"; C.inc(); C << nl << "IncomingAsync(in)"; @@ -3614,7 +3614,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) C << sb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name << "::ice_response(" + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_response(" << paramsDecl << ')'; C << sb; C << nl << "if(!_finished)"; @@ -3636,7 +3636,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) C << eb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_exception(const ::Ice::Exception& ex)"; C << sb; C << nl << "if(!_finished)"; @@ -3668,7 +3668,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) C << eb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_exception(const ::std::exception& ex)"; C << sb; C << nl << "if(!_finished)"; @@ -3677,7 +3677,7 @@ Slice::Gen::AsyncImplVisitor::visitOperation(const OperationPtr& p) C << eb; C << eb; - C << sp << nl << "void" << nl << "::IceAsync" << classScopedAMD << '_' << name + C << sp << nl << "void" << nl << "IceAsync" << classScopedAMD << '_' << name << "::ice_exception()"; C << sb; C << nl << "if(!_finished)"; |