summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-08 14:25:57 +0100
committerJose <jose@zeroc.com>2016-01-08 14:25:57 +0100
commit971b236cbf99f127bebc07328a3687520de60925 (patch)
tree4b7c07ea8f40c874228906b75178b860c2250eec /cpp/src/Ice/ConnectionI.cpp
parentICE-6910 - C++11 remove public cto for proxy classes (diff)
downloadice-971b236cbf99f127bebc07328a3687520de60925.tar.bz2
ice-971b236cbf99f127bebc07328a3687520de60925.tar.xz
ice-971b236cbf99f127bebc07328a3687520de60925.zip
windows build fixes
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 7ce32cd66dd..ee241cc4c39 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -2073,10 +2073,10 @@ Ice::ConnectionI::finish(bool close)
if(_closeCallback)
{
closeCallback(_closeCallback);
- _closeCallback = 0;
+ _closeCallback = ICE_NULLPTR;
}
- _heartbeatCallback = 0;
+ _heartbeatCallback = ICE_NULLPTR;
//
// This must be done last as this will cause waitUntilFinished() to return (and communicator