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/Slice/Parser.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/Slice/Parser.cpp')
| -rwxr-xr-x | cpp/src/Slice/Parser.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index ecbc3b1b625..79a4241cf78 100755 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -2407,23 +2407,11 @@ Slice::Container::validateConstant(const string& name, const TypePtr& type, cons if(constant) { -#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530) - // Strange Sun C++ 5.3 bug. - const IceUtil::HandleBase<SyntaxTreeBase>& hb = constant->type(); - lt = BuiltinPtr::dynamicCast(hb); -#else lt = BuiltinPtr::dynamicCast(constant->type()); -#endif } else { -#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x530) - // Strange Sun C++ 5.3 bug. - const IceUtil::HandleBase<SyntaxTreeBase>& hb = valueType; - lt = BuiltinPtr::dynamicCast(hb); -#else lt = BuiltinPtr::dynamicCast(valueType); -#endif } if(lt) |