diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-08-01 09:19:38 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-01 09:19:38 +0200 |
commit | fdadca3f4782c4fcc71ab86b091503855447e485 (patch) | |
tree | e18ae57cc00c82347daa2e51ccb55eaab8845bdc /cpp/src/Ice/Object.cpp | |
parent | Before RequestObserver change (diff) | |
download | ice-fdadca3f4782c4fcc71ab86b091503855447e485.tar.bz2 ice-fdadca3f4782c4fcc71ab86b091503855447e485.tar.xz ice-fdadca3f4782c4fcc71ab86b091503855447e485.zip |
Fixes
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r-- | cpp/src/Ice/Object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 875c58ed78d..58a730a9f9e 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -20,7 +20,7 @@ using namespace std; using namespace Ice; using namespace IceInternal; -Object* Ice::upCast(Object* p) { return p; } +IceUtil::Shared* Ice::upCast(Object* p) { return p; } void Ice::__patch(ObjectPtr& obj, ObjectPtr& v) |