1 files changed, 12 insertions, 10 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 48012c799bd..c4ab75e8d04 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -139,13 +139,6 @@ public:
     void writePendingObjects();
     void readPendingObjects();
 
-private:
-
-    //
-    // Optimization. The instance may not be deleted while a
-    // stack-allocated BasicStream still holds it.
-    //
-    Instance* _instance;
 
     struct PatchEntry {
 	PatchFunc patchFunc;
@@ -155,6 +148,18 @@ private:
     typedef std::map<Ice::Int, PatchList> PatchMap;
     typedef std::map<Ice::Int, Ice::ObjectPtr> IndexToPtrMap;
     typedef std::map<Ice::Int, std::string> TypeIdReadMap;
+    
+    typedef std::map<Ice::ObjectPtr, Ice::Int> PtrToIndexMap;
+    typedef std::map<std::string, Ice::Int> TypeIdWriteMap;
+
+
+private:
+
+    //
+    // Optimization. The instance may not be deleted while a
+    // stack-allocated BasicStream still holds it.
+    //
+    Instance* _instance;
 
     class ReadEncaps
     {
@@ -172,9 +177,6 @@ private:
 	TypeIdReadMap* typeIdMap;
     };
 
-    typedef std::map<Ice::ObjectPtr, Ice::Int> PtrToIndexMap;
-    typedef std::map<std::string, Ice::Int> TypeIdWriteMap;
-
     class WriteEncaps
     {
     public: