5 files changed, 37 insertions, 37 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 5e6a818db7d..e74f512ed3a 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,37 +1,37 @@
 Changes since version 2.0.0
 ---------------------------
 
-- Fixed a race condition in the IcePack on demand server activation code which
-  could cause clients to hang under rare conditions if the server couldn't be 
-  activated.
+- Fixed a race condition in the IcePack on demand server activation
+  code which could cause clients to hang under rare conditions if the
+  server couldn't be activated.
 
-- Fixed a small memory leak in the IcePack node that would occur each time a 
-  process is forked (Unix only).
+- Fixed a small memory leak in the IcePack node that would occur each
+  time a process is forked (Unix only).
 
 - Added 'object list' and 'object describe' IcePack admin commands.
 
-- Changed the signature of IcePack::Admin::removeObject() to take the identity
-  of the object instead of its proxy.
+- Changed the signature of IcePack::Admin::removeObject() to take the
+  identity of the object instead of its proxy.
 
-- Connection validation now checks for the timeout specified by the property
-  Ice.Override.ConnectTimeout and will raise Ice::ConnectTimeoutException if
-  the connection validation times out.
+- Connection validation now checks for the timeout specified by the
+  property Ice.Override.ConnectTimeout and will raise
+  Ice::ConnectTimeoutException if the connection validation times out.
 
-- Fixed an assert which could occur on connection establishment if there 
-  wasn't anymore file descriptors available.
+- Fixed an assert which could occur on connection establishment if
+  there wasn't anymore file descriptors available.
 
 - Improved support for on demand server activation in IcePack.
 
-- Improved the IcePack registry to prevent potential deadlocks caused by
-  thread starvation. NOTE: it's now required to configure the endpoints of
-  IcePack.Registry.Internal object adapter.
+- Improved the IcePack registry to prevent potential deadlocks caused
+  by thread starvation. NOTE: it's now required to configure the
+  endpoints of IcePack.Registry.Internal object adapter.
 
-- Fixed a bug where Ice::ObjectAdapter::activate() could throw 
-  Ice::ObjectAdapterDeactivatedException if the object adapter was deactivated
-  concurrently.
+- Fixed a bug where Ice::ObjectAdapter::activate() could throw
+  Ice::ObjectAdapterDeactivatedException if the object adapter was
+  deactivated concurrently.
 
-- Fixed a bug where setting the locator proxy on a indirect proxy could
-  cause an assert.
+- Fixed a bug where setting the locator proxy on a indirect proxy
+  could cause an assert.
 
 - Fixed a bug in IceSSL when multiple communicators are used.
 
@@ -42,11 +42,12 @@ Changes since version 2.0.0
 - Fixed a slice2cpp failure when the --output-dir option specified a
   directory containing backslashes.
 
-- Changed the signature of Ice::Service::main() and Ice::Service::run()
-  to accept a reference to argc (int & argc) rather than passing argc
-  by value (int argc). This is to ensure that, if Ice::initialize() or
-  Ice::Service::initializeCommunicator() rewrites argv, argc reflects
-  the number of elements of the rewritten argument vector.
+- Changed the signature of Ice::Service::main() and
+  Ice::Service::run() to accept a reference to argc (int & argc)
+  rather than passing argc by value (int argc). This is to ensure
+  that, if Ice::initialize() or Ice::Service::initializeCommunicator()
+  rewrites argv, argc reflects the number of elements of the rewritten
+  argument vector.
 
 - Fixed an encoding bug in IceSSL.
 
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 6e4a527305c..265061e5768 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -227,7 +227,6 @@ IceInternal::BasicStream::startSeq(int numElements, int minSize)
     {
 	checkSeq(bytesLeft);
     }
-
 }
 
 //
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index 0f14c69e97c..106c57279a5 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -381,8 +381,7 @@ MyDerivedClassI::opContext_async(const Test::AMD_MyClass_opContextPtr& cb, const
 }
 
 void
-MyDerivedClassI::opDerived_async(const Test::AMD_MyDerivedClass_opDerivedPtr& cb,
-				 const Ice::Current&)
+MyDerivedClassI::opDerived_async(const Test::AMD_MyDerivedClass_opDerivedPtr& cb, const Ice::Current&)
 {
     cb->ice_response();
 }
@@ -399,9 +398,9 @@ TestCheckedCastI::setContext(const Ice::Context& ctx)
     _ctx = ctx;
 }
 
-CheckedCastLocator::CheckedCastLocator()
+CheckedCastLocator::CheckedCastLocator() :
+    _servant(new TestCheckedCastI)
 {
-    _servant = new TestCheckedCastI;
 }
 
 Ice::ObjectPtr
@@ -415,11 +414,11 @@ CheckedCastLocator::locate(const Ice::Current& c, Ice::LocalObjectPtr&)
 }
 
 void
-CheckedCastLocator::finished(const ::Ice::Current&, const ::Ice::ObjectPtr&, const ::Ice::LocalObjectPtr&)
+CheckedCastLocator::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&)
 {
 }
 
 void
-CheckedCastLocator::deactivate(const ::std::string&)
+CheckedCastLocator::deactivate(const std::string&)
 {
 }
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index d197c6a99af..81903b595a1 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -360,7 +360,7 @@ MyDerivedClassI::opDerived(const Ice::Current&)
 {
 }
 
-::Ice::Context
+Ice::Context
 TestCheckedCastI::getContext(const Ice::Current& c)
 {
     return _ctx;
@@ -372,9 +372,9 @@ TestCheckedCastI::setContext(const Ice::Context& ctx)
     _ctx = ctx;
 }
 
-CheckedCastLocator::CheckedCastLocator()
+CheckedCastLocator::CheckedCastLocator() :
+    _servant(new TestCheckedCastI)
 {
-    _servant = new TestCheckedCastI;
 }
 
 Ice::ObjectPtr
@@ -388,11 +388,11 @@ CheckedCastLocator::locate(const Ice::Current& c, Ice::LocalObjectPtr&)
 }
 
 void
-CheckedCastLocator::finished(const ::Ice::Current&, const ::Ice::ObjectPtr&, const ::Ice::LocalObjectPtr&)
+CheckedCastLocator::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&)
 {
 }
 
 void
-CheckedCastLocator::deactivate(const ::std::string&)
+CheckedCastLocator::deactivate(const std::string&)
 {
 }
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index 48f6b4d2761..d173deed50f 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -168,6 +168,7 @@ public:
     void setContext(const Ice::Context& c);
 
 private:
+
     Ice::Context _ctx;
 };