4 files changed, 9 insertions, 4 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index 13eb6d3e3dc..57cdec9c461 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -641,6 +641,9 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name IceUtil
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name IceXML
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/cpp/slice/Glacier/Glacier.ice b/cpp/slice/Glacier/Glacier.ice
index 74219d9a173..7174194e3fc 100644
--- a/cpp/slice/Glacier/Glacier.ice
+++ b/cpp/slice/Glacier/Glacier.ice
@@ -66,7 +66,8 @@ interface Starter
      * given user id is not correct.
      *
      **/
-    Ice::Router* startRouter(string userId, string password; Ice::ByteSeq privateKey, Ice::ByteSeq publicKey, Ice::ByteSeq routerCert)
+    Ice::Router* startRouter(string userId, string password;
+			     Ice::ByteSeq privateKey, Ice::ByteSeq publicKey, Ice::ByteSeq routerCert)
 	throws InvalidPasswordException, CannotStartRouterException;
 };
 
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 3ee3094029a..2c403c7d3c4 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -195,7 +195,7 @@ IceInternal::BasicStream::writeSize(Int v)
 {
     if (v > 0x7f)
     {
-	write(Byte(255));
+	write(Byte(0xff));
 	write(v);
     }
     else
@@ -215,7 +215,7 @@ IceInternal::BasicStream::readSize(Ice::Int& v)
     }
     else
     {
-	v = static_cast<Int>(b);       
+	v = static_cast<Int>(b);     
     }
 }
 
diff --git a/cpp/src/Ice/SslBaseCerts.h b/cpp/src/Ice/SslBaseCerts.h
index ec42e4c5bf1..a2f129f1b82 100644
--- a/cpp/src/Ice/SslBaseCerts.h
+++ b/cpp/src/Ice/SslBaseCerts.h
@@ -19,8 +19,8 @@ namespace IceSSL
 
 class BaseCertificates
 {
-
 public:
+
     BaseCertificates();
     BaseCertificates(CertificateDesc&, CertificateDesc&, DiffieHellmanParamsFile&);
     BaseCertificates(BaseCertificates&);
@@ -31,6 +31,7 @@ public:
     const DiffieHellmanParamsFile& getDHParams() const;
 
 protected:
+
     CertificateDesc _rsaCert;
     CertificateDesc _dsaCert;
     DiffieHellmanParamsFile _dhParams;