summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2009-12-07 11:13:56 +0100
committerBenoit Foucher <benoit@zeroc.com>2009-12-07 11:13:56 +0100
commit658ac73336cf61454bda551e9438b9a17bfc24b3 (patch)
treec094be8fc92bc8cd77c0fed00acda4f15873ec05 /cpp/src/Ice/Object.cpp
parent4424 - .NET FxCop Globalization Rules (diff)
downloadice-658ac73336cf61454bda551e9438b9a17bfc24b3.tar.bz2
ice-658ac73336cf61454bda551e9438b9a17bfc24b3.tar.xz
ice-658ac73336cf61454bda551e9438b9a17bfc24b3.zip
Fixed bug 4225 -- servant dispatch needs to lock/unlock the global GC mutex
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 0d102ae1a63..0fd4c42c0a1 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -19,7 +19,7 @@ using namespace std;
using namespace Ice;
using namespace IceInternal;
-IceInternal::GCShared* IceInternal::upCast(Object* p) { return p; }
+IceUtil::Shared* IceInternal::upCast(Object* p) { return p; }
bool
Ice::Object::operator==(const Object& r) const