diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-01-04 22:18:31 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-01-04 22:18:31 +0000 |
| commit | d99381a4dd31c99d514ae6fb5c155a1b81d97e3f (patch) | |
| tree | 6d7a17b9c04535820166142e280d72f15a6fabcf /cpp/src | |
| parent | Fixed NPTL support (diff) | |
| download | ice-d99381a4dd31c99d514ae6fb5c155a1b81d97e3f.tar.bz2 ice-d99381a4dd31c99d514ae6fb5c155a1b81d97e3f.tar.xz ice-d99381a4dd31c99d514ae6fb5c155a1b81d97e3f.zip | |
fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index a5e86441a70..19640aa20de 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -89,18 +89,15 @@ IceInternal::BasicStream::reserve(Container::size_type sz) } IceInternal::BasicStream::WriteEncaps::WriteEncaps() - : writeIndex(0), toBeMarshaledMap(0), marshaledMap(0), typeIdIndex(0), typeIdMap(0) + : writeIndex(0), toBeMarshaledMap(0), marshaledMap(0), typeIdMap(0), typeIdIndex(0) { } IceInternal::BasicStream::WriteEncaps::~WriteEncaps() { - if(toBeMarshaledMap) - { - delete toBeMarshaledMap; - delete marshaledMap; - delete typeIdMap; - } + delete toBeMarshaledMap; + delete marshaledMap; + delete typeIdMap; } void @@ -154,18 +151,15 @@ IceInternal::BasicStream::endWriteEncaps() } IceInternal::BasicStream::ReadEncaps::ReadEncaps() - : patchMap(0), unmarshaledMap(0), typeIdIndex(0), typeIdMap(0) + : patchMap(0), unmarshaledMap(0), typeIdMap(0), typeIdIndex(0) { } IceInternal::BasicStream::ReadEncaps::~ReadEncaps() { - if(patchMap) - { - delete patchMap; - delete unmarshaledMap; - delete typeIdMap; - } + delete patchMap; + delete unmarshaledMap; + delete typeIdMap; } void |