diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-10 08:49:45 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-10 08:49:45 +0200 |
| commit | 981d2ac7c8f825f92670f9121a7d29edd94da6f9 (patch) | |
| tree | 286f13f365513c9894c0ec4167b8bbef30965bf9 /cpp/src/slice2java/Gen.cpp | |
| parent | Fixed communicator flushBatchRequests to allow tracing (diff) | |
| parent | Fixed ICE-4863 (IceProxy::Ice::Object derives privately from Mutex) + a few w... (diff) | |
| download | ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.tar.bz2 ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.tar.xz ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.zip | |
Merge remote-tracking branch 'origin/encoding11' into withoutsync
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 1a9b678b6aa..1b049475ffd 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -2442,22 +2442,7 @@ Slice::Gen::TieVisitor::visitClassDefStart(const ClassDefPtr& p) const bool hasAMD = cl->hasMetaData("amd") || (*r)->hasMetaData("amd"); const bool optionalMapping = useOptionalMapping(*r); -#if defined(__SUNPRO_CC) && (__SUNPRO_CC==0x550) - // - // Work around for Sun CC 5.5 bug #4853566 - // - string opName; - if(hasAMD) - { - opName = (*r)->name() + "_async"; - } - else - { - opName = fixKwd((*r)->name()); - } -#else string opName = hasAMD ? (*r)->name() + "_async" : fixKwd((*r)->name()); -#endif TypePtr ret = (*r)->returnType(); string retS = typeToString(ret, TypeModeReturn, package, (*r)->getMetaData(), true, |