summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Collector.cpp1
-rw-r--r--cpp/src/Ice/EventHandler.cpp2
2 files changed, 1 insertions, 2 deletions
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!
{
}