summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-03-08 19:37:13 -0500
committerBernard Normier <bernard@zeroc.com>2017-03-08 19:37:13 -0500
commit11678336dea1f3676881b87bbe8ca3e3cb6b5296 (patch)
treeec4bbc16d9fdfe1f9c48f374f26169ba4e88cb3a /cpp/src/Ice/Object.cpp
parentPython thread hook fixes (diff)
downloadice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.bz2
ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.xz
ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.zip
Removed Current's default value in the C++11 mapping
Renamed Ice::noExplicitCurrent to Ice::emptyCurrent
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index db4b01cf72e..aa053d59d1d 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -20,7 +20,7 @@ using namespace IceInternal;
namespace Ice
{
-const Current noExplicitCurrent = Current();
+const Current emptyCurrent = Current();
}
#ifndef ICE_CPP11_MAPPING