diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-28 10:40:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-28 10:40:14 +0200 |
| commit | 8527be5894d0e0ba90db306b8ab124c04144ab44 (patch) | |
| tree | 5edbe2c2104764f9b3ba8721e573b32fe32f9baf /cpp/src/Ice/Object.cpp | |
| parent | minor fix to build IceGridGUI in OsX (diff) | |
| download | ice-8527be5894d0e0ba90db306b8ab124c04144ab44.tar.bz2 ice-8527be5894d0e0ba90db306b8ab124c04144ab44.tar.xz ice-8527be5894d0e0ba90db306b8ab124c04144ab44.zip | |
Java & C# port
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 d5048326e93..096bf434b5f 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; -IceUtil::Shared* Ice::upCast(Object* p) { return p; } +Object* Ice::upCast(Object* p) { return p; } void Ice::__patch(ObjectPtr& obj, ObjectPtr& v) |