fix

2 files changed, 19 insertions, 18 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index adb0055f8a9..b7ef46b9072 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -205,7 +205,7 @@ private:
     //
     Instance* _instance;
 
-    class ICE_API ReadEncaps
+    class ICE_API ReadEncaps : public ::IceUtil::noncopyable
     {
     public:
 
@@ -220,11 +220,18 @@ private:
 
 	PatchMap* patchMap;
 	IndexToPtrMap* unmarshaledMap;
-	Ice::Int typeIdIndex;
 	TypeIdReadMap* typeIdMap;
+	Ice::Int typeIdIndex;
+
+    private:
+
+	//
+	// operator=() and operator==() are not allowed.
+	//
+	ReadEncaps& operator=(const ReadEncaps&);
     };
 
-    class ICE_API WriteEncaps
+    class ICE_API WriteEncaps : public ::IceUtil::noncopyable
     {
     public:
 
@@ -236,8 +243,8 @@ private:
 	Ice::Int writeIndex;
 	PtrToIndexMap* toBeMarshaledMap;
 	PtrToIndexMap* marshaledMap;
-	Ice::Int typeIdIndex;
 	TypeIdWriteMap* typeIdMap;
+	Ice::Int typeIdIndex;
     };
 
     std::list<ReadEncaps> _readEncapsStack;
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