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/IceGrid/DescriptorHelper.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/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 ce9a74810e6..a9388ef7a8e 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 { |