1 files changed, 7 insertions, 13 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 595b8895aa4..5871e510672 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -7,8 +7,7 @@
 //
 // **********************************************************************
 
-#ifndef ICE_BASIC_STREAM_H
-#define ICE_BASIC_STREAM_H
+#pragma once
 
 #include <Ice/InstanceF.h>
 #include <Ice/ObjectF.h>
@@ -90,8 +89,6 @@ public:
         b.resize(sz);
     }
 
-    void format(Ice::FormatType);
-
     void startWriteObject(const Ice::SlicedDataPtr& data)
     {
         assert(_currentWriteEncaps && _currentWriteEncaps->encoder);
@@ -138,7 +135,7 @@ public:
 
     void startWriteEncaps();
 
-    void startWriteEncaps(const Ice::EncodingVersion& encoding)
+    void startWriteEncaps(const Ice::EncodingVersion& encoding, Ice::FormatType format)
     {
         checkSupportedEncoding(encoding);
 
@@ -152,6 +149,7 @@ public:
             _currentWriteEncaps = new WriteEncaps();
             _currentWriteEncaps->previous = oldEncaps;
         }
+        _currentWriteEncaps->format = format;
         _currentWriteEncaps->encoding = encoding;
         _currentWriteEncaps->start = b.size();
 
@@ -966,9 +964,9 @@ private:
     class EncapsEncoder : private ::IceUtil::noncopyable
     {
     public:
-        EncapsEncoder(BasicStream* stream, WriteEncaps* encaps, Ice::FormatType format) : 
-            _stream(stream), _encaps(encaps), _format(format), _sliceType(NoSlice), _usesClasses(false),
-            _objectIdIndex(0), _typeIdIndex(0)
+        EncapsEncoder(BasicStream* stream, WriteEncaps* encaps) : 
+            _stream(stream), _encaps(encaps), _sliceType(NoSlice), _usesClasses(false), _objectIdIndex(0), 
+            _typeIdIndex(0)
         {
         }
 
@@ -1014,7 +1012,6 @@ private:
 
         BasicStream* _stream;
         WriteEncaps* _encaps;
-        const Ice::FormatType _format;
 
         // Object/exception attributes
         SliceType _sliceType;
@@ -1093,6 +1090,7 @@ private:
 
         Container::size_type start;
         Ice::EncodingVersion encoding;
+        Ice::FormatType format;
 
         EncapsEncoder* encoder;
 
@@ -1127,8 +1125,6 @@ private:
     int _startSeq;
     int _minSeqSize;
 
-    Ice::FormatType _format;
-
     static const Ice::Byte FLAG_HAS_TYPE_ID_STRING;
     static const Ice::Byte FLAG_HAS_TYPE_ID_INDEX;
     static const Ice::Byte FLAG_HAS_OPTIONAL_MEMBERS;
@@ -1138,5 +1134,3 @@ private:
 };
 
 } // End namespace IceInternal
-
-#endif