diff options
Diffstat (limited to 'cpp/src/Ice')
| -rw-r--r-- | cpp/src/Ice/ImplicitContextI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index c9d60b2ae4e..82cb8b70ef7 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -471,7 +471,7 @@ PerThreadImplicitContext::clearThreadContext() const # ifdef _WIN32 if(TlsSetValue(_key, 0) == 0) { - IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); + throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError()); } # else if(int err = pthread_setspecific(_key, 0)) diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 1dfd7290b8f..20a0189c3c1 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -413,7 +413,7 @@ Ice::CommunicatorHolder::operator=(shared_ptr<Communicator> communicator) } Ice::CommunicatorHolder& -Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) +Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) noexcept { if(_communicator) { diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index f4713ddea3a..a197b15e9fc 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -298,7 +298,7 @@ getLocalAddresses(ProtocolSupport protocol, bool includeLoopback, bool singleAdd break; } - DWORD size; + DWORD size = 0; DWORD rv = GetAdaptersAddresses(family, 0, ICE_NULLPTR, ICE_NULLPTR, &size); if(rv == ERROR_BUFFER_OVERFLOW) { |