Fixes

3 files changed, 1 insertions, 8 deletions

diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 47259c0f5c6..3b529b9d977 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -114,13 +114,7 @@ private:
     // Optimization. The instance may not be deleted while a
     // stack-allocated Incoming still holds it.
     //
-    // TODO: On WIN32 I get crashes with this optimization from time
-    // to time. I don't know why yet.
-#ifdef WIN32
-    InstancePtr _instance;
-#else
     const InstancePtr& _instance;
-#endif
 
     struct Encaps
     {
diff --git a/cpp/src/Ice/Collector.cpp b/cpp/src/Ice/Collector.cpp
index 50aac633849..df11c579402 100644
--- a/cpp/src/Ice/Collector.cpp
+++ b/cpp/src/Ice/Collector.cpp
@@ -429,7 +429,6 @@ IceInternal::Collector::setState(State state)
 		_threadPool->_register(_transceiver->fd(), this);
 	    }
 	    _threadPool->unregister(_transceiver->fd(), true);
-	    break;
 	}
     }
 
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index d81de4f3bcc..9b9f7dcebfb 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -22,7 +22,7 @@ void IceInternal::decRef(EventHandler* p) { p->__decRef(); }
 
 IceInternal::EventHandler::EventHandler(const InstancePtr& instance) :
     _instance(instance),
-    _stream(instance)
+    _stream(_instance) // Not instance! This must be _instance!
 {
 }