4 files changed, 6 insertions, 7 deletions
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h
index c5fbc8c7481..b9119787ecb 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/Stream.h
@@ -176,7 +176,7 @@ public:
     virtual void endEncapsulation() = 0;
     virtual Ice::EncodingVersion skipEncapsulation() = 0;
 
-    virtual Ice::EncodingVersion getEncoding() = 0;
+    virtual Ice::EncodingVersion getEncoding() const = 0;
 
     virtual void readPendingObjects() = 0;
 
@@ -292,7 +292,7 @@ public:
     virtual void startEncapsulation() = 0;
     virtual void endEncapsulation() = 0;
 
-    virtual Ice::EncodingVersion getEncoding() = 0;
+    virtual Ice::EncodingVersion getEncoding() const = 0;
 
     virtual void writePendingObjects() = 0;
 
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index b4f2753802f..a86352dc009 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -2296,7 +2296,6 @@ IceInternal::BasicStream::EncapsDecoder::throwException(const UserExceptionFacto
             //
             try
             {
-                assert(exceptionFactory);
                 exceptionFactory->createAndThrow(_typeId);
             }
             catch(UserException& ex)
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index f01e6f8e190..34f6bc808f5 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -350,7 +350,7 @@ InputStreamI::skipEncapsulation()
 }
 
 EncodingVersion
-InputStreamI::getEncoding()
+InputStreamI::getEncoding() const
 {
     return _is->getReadEncoding();
 }
@@ -631,7 +631,7 @@ OutputStreamI::endEncapsulation()
 }
 
 EncodingVersion
-OutputStreamI::getEncoding()
+OutputStreamI::getEncoding() const
 {
     return _os->getWriteEncoding();
 }
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
index 9b0b04387d5..113e09e11f4 100644
--- a/cpp/src/Ice/StreamI.h
+++ b/cpp/src/Ice/StreamI.h
@@ -61,7 +61,7 @@ public:
     virtual void endEncapsulation();
     virtual Ice::EncodingVersion skipEncapsulation();
 
-    virtual Ice::EncodingVersion getEncoding();
+    virtual Ice::EncodingVersion getEncoding() const;
 
     virtual void readPendingObjects();
 
@@ -163,7 +163,7 @@ public:
     virtual void startEncapsulation();
     virtual void endEncapsulation();
 
-    virtual Ice::EncodingVersion getEncoding();
+    virtual Ice::EncodingVersion getEncoding() const;
 
     virtual void writePendingObjects();