Sun port

1 files changed, 15 insertions, 12 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 1fc8586fad8..ce075f27b72 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -139,23 +139,29 @@ 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 {
+    struct PatchEntry 
+    {
 	PatchFunc patchFunc;
 	void* patchAddr;
     };
+
     typedef std::vector<PatchEntry> PatchList;
     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 ICE_API ReadEncaps
     {
     public:
@@ -172,9 +178,6 @@ private:
 	TypeIdReadMap* typeIdMap;
     };
 
-    typedef std::map<Ice::ObjectPtr, Ice::Int> PtrToIndexMap;
-    typedef std::map<std::string, Ice::Int> TypeIdWriteMap;
-
     class ICE_API WriteEncaps
     {
     public: