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/include/Ice/BasicStream.h | |
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/include/Ice/BasicStream.h')
-rw-r--r-- | cpp/include/Ice/BasicStream.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index f9ab44f1049..69bfc1a2e53 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -891,7 +891,7 @@ private: class WriteEncaps; enum SliceType { NoSlice, ObjectSlice, ExceptionSlice }; - class EncapsDecoder : private ::IceUtil::noncopyable + class ICE_API EncapsDecoder : private ::IceUtil::noncopyable { public: EncapsDecoder(BasicStream* stream, ReadEncaps* encaps, bool sliceObjects) : @@ -962,7 +962,7 @@ private: Ice::Int _typeIdIndex; }; - class EncapsEncoder : private ::IceUtil::noncopyable + class ICE_API EncapsEncoder : private ::IceUtil::noncopyable { public: EncapsEncoder(BasicStream* stream, WriteEncaps* encaps) : @@ -1039,7 +1039,7 @@ private: { public: - ReadEncaps() : decoder(0), previous(0) + ReadEncaps() : start(0), decoder(0), previous(0) { // Inlined for performance reasons. } |