Removed cpp:unscoped from all Ice enums

CompressBatch is now "scoped" in C++98 and ObjC

1 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 4c80fe57604..fe931ecebc3 100644
--- a/cpp/src/Ice/OutputStream.cpp
+++ b/cpp/src/Ice/OutputStream.cpp
@@ -76,7 +76,7 @@ Ice::OutputStream::OutputStream() :
     _instance(0),
     _closure(0),
     _encoding(currentEncoding),
-    _format(CompactFormat),
+    _format(ICE_ENUM(FormatType, CompactFormat)),
     _currentEncaps(0)
 {
 }
@@ -216,7 +216,7 @@ Ice::OutputStream::startEncapsulation()
     }
     else
     {
-        startEncapsulation(_encoding, Ice::DefaultFormat);
+        startEncapsulation(_encoding, Ice::ICE_ENUM(FormatType, DefaultFormat));
     }
 }
 
@@ -898,7 +898,7 @@ Ice::OutputStream::initEncaps()
         _currentEncaps->encoding = _encoding;
     }
 
-    if(_currentEncaps->format == Ice::DefaultFormat)
+    if(_currentEncaps->format == Ice::ICE_ENUM(FormatType, DefaultFormat))
     {
         _currentEncaps->format = _format;
     }
@@ -1120,7 +1120,7 @@ Ice::OutputStream::EncapsEncoder11::write(const ValuePtr& v)
     {
         _stream->writeSize(0); // Nil reference.
     }
-    else if(_current && _encaps->format == SlicedFormat)
+    else if(_current && _encaps->format == ICE_ENUM(FormatType, SlicedFormat))
     {
         //
         // If writing an instance within a slice and using the sliced
@@ -1188,7 +1188,7 @@ Ice::OutputStream::EncapsEncoder11::startSlice(const string& typeId, int compact
     _current->sliceFlagsPos = _stream->b.size();
 
     _current->sliceFlags = 0;
-    if(_encaps->format == SlicedFormat)
+    if(_encaps->format == ICE_ENUM(FormatType, SlicedFormat))
     {
         _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format.
     }
@@ -1210,7 +1210,7 @@ Ice::OutputStream::EncapsEncoder11::startSlice(const string& typeId, int compact
         // Encode the type ID (only in the first slice for the compact
         // encoding).
         //
-        if(_encaps->format == SlicedFormat || _current->firstSlice)
+        if(_encaps->format == ICE_ENUM(FormatType, SlicedFormat) || _current->firstSlice)
         {
             if(compactId >= 0)
             {
@@ -1275,7 +1275,7 @@ Ice::OutputStream::EncapsEncoder11::endSlice()
     //
     if(!_current->indirectionTable.empty())
     {
-        assert(_encaps->format == SlicedFormat);
+        assert(_encaps->format == ICE_ENUM(FormatType, SlicedFormat));
         _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE;
 
         //
@@ -1330,7 +1330,7 @@ Ice::OutputStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedD
     // essentially "slices" the instance into the most-derived type
     // known by the sender.
     //
-    if(_encaps->format != SlicedFormat)
+    if(_encaps->format != ICE_ENUM(FormatType, SlicedFormat))
     {
         return;
     }