diff options
author | Bernard Normier <bernard@zeroc.com> | 2012-09-07 11:19:34 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2012-09-07 11:19:34 -0400 |
commit | c9c426efd3e579d0220fbdee4a0a261fa2c191b5 (patch) | |
tree | d67c6356bfda2700e983586afaa71f28734c2cc9 /cpp/src/IceGrid/DescriptorHelper.cpp | |
parent | Undo pragma-once-in-header enhancement (diff) | |
download | ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.tar.bz2 ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.tar.xz ice-c9c426efd3e579d0220fbdee4a0a261fa2c191b5.zip |
Port to Solaris 11 / Solaris Studio 12.3 (== CC 5.12)
Fix to BasicStream.h (unitialized data member) that caused occasional failures in Ice/stream test
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
-rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 67467f280f9..8c339ae8166 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -18,6 +18,13 @@ using namespace IceUtil; using namespace IceUtilInternal; using namespace IceGrid; +#ifdef __SUNPRO_CC +// +// Disable warning about unassigned function objects +// +# pragma error_messages(off,unassigned) +#endif + namespace IceGrid { |