- Merge IPv6 support from Dwayne's branch.

- Reviewed and fixed IPv6 bugs.
- Fixed bug in the outgoing connection factory where an assert could be
  triggered if the proxy contained identical endpoints

1 files changed, 1 insertions, 1 deletions

diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 9b1a126a1d6..b47686f19b7 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -111,7 +111,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
         return factory->create(str.substr(end), oaEndpoint);
 #else
         // Code below left in place for debugging.
-        
+
         EndpointIPtr e = factory->create(str.substr(end), oaEndpoint);
         BasicStream bs(_instance.get());
         e->streamWrite(&bs);