summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Application.cpp2
-rw-r--r--cpp/src/Ice/ConnectionI.cpp2
-rw-r--r--cpp/src/IceGrid/AdapterCache.cpp2
-rw-r--r--cpp/src/IceUtil/RWRecMutex.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 2e143fa81f2..0105a212670 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -56,7 +56,7 @@ const DWORD SIGHUP = CTRL_LOGOFF_EVENT;
static void holdInterruptCallback(int signal)
{
- CtrlCHandlerCallback callback;
+ CtrlCHandlerCallback callback = 0;
{
StaticMutex::Lock lock(_mutex);
while(!_released)
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 2115665397b..98863f20a16 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -37,7 +37,7 @@ void IceInternal::decRef(ConnectionI* p) { p->__decRef(); }
void
Ice::ConnectionI::validate()
{
- bool active;
+ bool active = false;
if(!_endpoint->datagram()) // Datagram connections are always implicitly validated.
{
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 2eedddda998..73d09fc2324 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -306,7 +306,7 @@ ReplicaGroupEntry::getProxies(bool allRegistered, int& nReplicas)
{
ReplicaSeq replicas;
bool adaptive = false;
- LoadSample loadSample;
+ LoadSample loadSample = LoadSample1;
{
Lock sync(*this);
if(_replicas.empty())
diff --git a/cpp/src/IceUtil/RWRecMutex.cpp b/cpp/src/IceUtil/RWRecMutex.cpp
index 631e6a10658..bb817eb646d 100644
--- a/cpp/src/IceUtil/RWRecMutex.cpp
+++ b/cpp/src/IceUtil/RWRecMutex.cpp
@@ -240,8 +240,8 @@ IceUtil::RWRecMutex::timedWriteLock(const Time& timeout) const
void
IceUtil::RWRecMutex::unlock() const
{
- bool ww;
- bool wr;
+ bool ww = false;
+ bool wr = false;
{
Mutex::Lock lock(_mutex);